Changed Gemfile
Merge branch 'master' of https://github.com/amisaka/sample_app
Configuration files from nginx beeing changed