initial commit
Update Gemfile for deployment to Heroku
Fix merge