rails new commit
Merge branch 'master' of github.com:kparks29/Project-3