rails init
Merge branch 'master' of github.com:cdawsonhall/first_app