figuring out how to stop polling for battles
Merge branch 'master' into more_battle_stuff
battle button stops polling
polling starts again after battle
Merge pull request #48 from pocket-gophers-2014/more_battle_stuff

polling stops during battle