Update Gemfile.lock for Heroku
Adding other controllers
Merging..