getting app ready for heroku
conflict in gemfile resolved