edit Gemfile for heroku deployment
fix Gemfile for heroku
Merge branch 'teimo'