Hola
Merge branch 'entrega2' of https://github.com/jmvalenz/taller-integracion into entrega2
Merge branch 'entrega3' of https://github.com/jmvalenz/taller-integracion into entrega3
cambio int por integer