mejorado
guardando
Merge branch 'master' of https://github.com/softluciones/granja
Merge remote-tracking branch 'origin/jose2'