Update gemfile
Specify ruby version
Merge branch 'heroku_setting'