Arreglando errores
Merge branches 'master' and 'mauri' into mauri
Merge branches 'master' and 'mauri' into mauri
Merge branches 'master' and 'mauri' into mauri
Merge branches 'master' and 'mauri' into mauri
Merge branches 'master' and 'mauri' into mauri
Implementando pruebas y código max/min
Merge branches 'mauri' and 'master'