delete database.yml
Merge remote-tracking branch 'origin/master'