More endgame/reset logiv
Merge branch 'master' of github.com:Dr-Jerm/nmGameJam2013
more of the same
Merge branch 'master' of github.com:Dr-Jerm/nmGameJam2013

Conflicts:
	GameServer.js