updates to server. it actually works!?!?!?!?!?
...
Merge branch 'master' of https://github.com/njchristian/Multiplayer-Game

Conflicts:
	Server Prototype/index.html