add database.yml
Merge branch 'master' into full_title