Updated Gemfile for deployment to Heroku
Merging origin and master