Solución completa
Merge remote-tracking branch 'origin/esteban-lopez'
Merge remote-tracking branch 'origin/master' into marco-rodriguez