removed specific database.yml
fixing merge
Merge pull request #5 from shicholas/master

Julian -> Master