tweaked front page background image
Merge branch 'homepage_css' of https://github.com/pocket-gophers-2014/zombify into BattleLogic
basic geolocation
merge conflicts
WIP checkin logic
Merge branch 'master' into checkin_module
merging
g Please enter a commit message to explain why this merge is necessary,
WIP saving so I can push new master to heroku
pushing to heroku
merging with master
Finishes Check-iN Widget GREEN without tests
Merge branch 'master' of https://github.com/pocket-gophers-2014/zombify
merging with master, what do you want from me?
fixes merge conflicts
fixes font on send location button
fix list style
Update Gemfile
Merge pull request #50 from pocket-gophers-2014/checkin_module

Checkin module