gemfile edited
Merge branch 'hotfix/heroku'