Add database.yml to gitignore
Conflict resolved