Errores de git
Merge branches 'master' and 'ivan' into ivan