Unborked Gemfile
Merge branch 'develop' of github.com:TeamViperFish/HackathonProject into develop
Merge pull request #28 from j3rn/develop

Unborked Gemfile