Modifico gitignore
Guardo dump de la BD
Change BD config
Solved conflicts between branches