Edited player lobby and remotes
controlstank2
pick tank
new map
new tanks (square)
remove tank-fire
lobby flow
Merge branch 'master' of github.com:dcsan/gyrohack

Conflicts:
	app/client/battle_lobby/battle_lobby.html
Merge branch 'master' into dcsan

Conflicts:
	app/client/battle/battle.html
	app/client/player_lobby/player_lobby.html
	app/client/player_remote/player_remote.html
ghetto git
lobby html hack merge
save
Merge remote-tracking branch 'origin/dcsan' into pilot