Remove database.yml from git
Merge branch 'master' of github.com:christophermiles9/hartl_sample_app