database.yml
Merge branch 'master' of github.com:mgup/hq