Update Gemfile.lock for Heroku
Merge branch 'heroku'