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

adasdfad
Mdf
Merge branch 'master' into checkin_module
Merge pull request #56 from pocket-gophers-2014/game_logic

Game logic
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
removing duplicate UserAuth bindings
requiring js files
Nothing actually changed
Merge branch 'master' into game_logic
three specs passing for battle.js
still having trouble with fixtures, test pending
clean up routes
fixed results logic and moved it into a model
Merge pull request #58 from pocket-gophers-2014/jasmine_tests

Jasmine tests
Merge branch 'master' into Clean_UP
merging
Merge pull request #59 from pocket-gophers-2014/stats

fixed results logic and moved it into a model