new rails app
Merge branch 'master' of github.com:ruan20a/sample_app