Merge branch 'master' of https://github.com/asadlionpk/realtime-multiplayer-in-html5

Conflicts:
	game.server.js
Merge branch 'master' of https://github.com/asadlionpk/realtime-multiplayer-in-html5