bugfix
Merge branch 'master' of https://github.com/oligafner/4-for-2

Conflicts:
	client/game/game.html
	client/game/main.game.js
	server/server.js