made attempts to fix the end game
Merge branch 'master' of https://github.com/pencilcheck/PvP

Conflicts:
	app/styles/maingame.css