rename coluna lotacao
ignore database.yml
Merge