Formatting
Merge branch 'master' of https://github.com/danielduan/CodeBattle

Conflicts:
	css/game.css
	game.html