database.yml
Merge branch 'master' of https://github.com/fiabane/a-new-hope