reset Gemfile.lock
fix styling for mobile that was broken by rebase
Merge pull request #70 from pocket-gophers-2014/steven-review-refactor-demo

Steven review refactor demo
Merge branch 'master' of https://github.com/pocket-gophers-2014/zombify
Merge pull request #71 from pocket-gophers-2014/Styling

Styling
basic jasmine tests for controller
more passing tests for polling.js
jasmine tests working, jasmine ajax not working. whyyyyy?
Merge pull request #72 from pocket-gophers-2014/polling_jasmine_tests

Polling jasmine tests
getting ready to merge
Merge pull request #73 from pocket-gophers-2014/fix_handle_gen

fixes handle generation and adds regeneration after battles
Add rspec tests to Checkin model and take care of no ingredient discovered case