added gems for heroku
committing Gemfile.lock
merge