Delete database.yml
ignore database + revision changes
Merge branch 'master' of github.com:victerryso/enterprise