Delete .gitignore
Resuelto conflictos de  merge