Update Gemfile.lock for Heroku
Merging two branches