Merge branch 'master' of tuxcode.org:pentagameshow

index.html

@@ -63,12 +63,12 @@
 	<p>Welches Land erlaubt Filesharing für private Zwecke straffrei?</p>
       </div>
       <div id="nedap">
-	<p class="url">http://spaceboyz.net:2342/</p>
+	<p class="url">http://nedap.c3d2.de:2342/</p>
 	<canvas id="polls" width="400" height="400">
 	</canvas>
       </div>
       <div id="gifs">
-	<p class="url">http://spaceboyz.net:2342/</p>
+	<p class="url">http://nedap.c3d2.de:2342/</p>
       </div>
       <div id="irc">
 	<p class="caption">Backend, where are thou?</p>

package.json

@@ -6,6 +6,8 @@
     "ltx":">=0.1.1",
     "websocket":">=1.0.1",
     "mime": ">=1.2.4",
-    "twitter": ">=0.1.17"
+    "twitter": ">=0.1.17",
+    "formidable": ">=1.0.8",
+    "qs": ">=0.4.0"
   }
 }

server.js

@@ -43,7 +43,7 @@ function connectNedap() {
 	console.error(e.stack || e);
 	setTimeout(connectNedap, 1000);
     });
-    nedapClient.connect('ws://spaceboyz.net:2342/', 'quiz-nedap');
+    nedapClient.connect('ws://nedap.c3d2.de:2342/', 'quiz-nedap');
 }
 connectNedap();