gitignore

2 files changed, 19 insertions, 7 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..7afaa05
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,12 @@
+node_modules
+.bundle
+*.DS_Store
+log/*.log
+tmp/
+.sass-cache/
+.#*
+*~
+*.orig
+*#
+*.swp
+solr
diff --git a/server.js b/server.js
index e8d0aec..575b526 100644
--- a/server.js
+++ b/server.js
@@ -4,8 +4,7 @@ var express = require('express'),
 		app = express(),
 		http = require('http'),
 		server = http.createServer(app),
-		io = require('socket.io').listen(server),
-		mongoose = require('mongoose');
+		io = require('socket.io').listen(server);
 
 var s3 = knox.createClient({
   key: process.env.ASDF_S3_KEY,
@@ -55,11 +54,6 @@ app.post('/upload', function(req, res) {
 /******************************* WEBSOCKETS
 */
 
-io.sockets.on( 'connection', function(socket){
-  socket.emit( 'join', Channel.join() );
-	function echo
-});
-
 var State = {
  	WAITING: 0,
 	DRAWING: 1,
@@ -94,6 +88,12 @@ Channel.prototype.join = function(){
 	}
 }
 
+
+var game = new Channel ();
+io.sockets.on( 'connection', function(socket){
+  socket.emit( 'join', game.join() );
+});
+
 /******************************* DONE
 */