modified
Gemfile
Merge branch 'master' of https://github.com/wangyzyoga/sample_app