removed database.yml from source control
Merge branch 'master' into production
removed database.yml
changes to database.yml
fix