Edited battle room
Merge branch 'master' of https://github.com/dcsan/gyrohack

Conflicts:
	app/client/battle/battle.html