tweaked front page background image
Merge branch 'homepage_css' of https://github.com/pocket-gophers-2014/zombify into BattleLogic
basic geolocation
merge conflicts
Merge pull request #46 from pocket-gophers-2014/game_logic

rake create_game automatically resets all messages to not being called
trying to merge
Merge branch 'master' into switching_css_framework
WIP checkin logic
Merge branch 'master' into checkin_module
merging
g Please enter a commit message to explain why this merge is necessary,
adds CSS help
Merge pull request #47 from pocket-gophers-2014/switching_css_framework

Switching css framework
WIP saving so I can push new master to heroku
figuring out how to stop polling for battles
pushing to heroku
Merge branch 'master' into more_battle_stuff
battle button stops polling
polling starts again after battle
merging with master
adds minor styling
Merge branch 'master' into switching_css_framework