git ignore database.yml ?
Merge branch 'master' of https://github.com/jpzimmerr/DeKoepel