fix pull
merge with master
Merge branch 'master' of https://github.com/pocket-gophers-2014/zombify

adasdfad
Mdf
Merge branch 'master' into checkin_module
geopositioning funcitons again
Merge branch 'master' of https://github.com/pocket-gophers-2014/zombify
want to merge
fixing merge conflict
Merge pull request #57 from pocket-gophers-2014/checkin_module

Checkin module