gemfile upd
Merge branch 'master' of github.com:Dust101/sample_app