reset Gemfile.lock
fix styling for mobile that was broken by rebase
Merge branch 'master' of https://github.com/pocket-gophers-2014/zombify
Merge pull request #71 from pocket-gophers-2014/Styling

Styling