git ignore db.yml
git ignore database.yml
adding in rachetttttt
merge fix