Merge pull request #1 from palomy/master

Actualizar
Programa estable
Merge pull request #3 from valero90/master

Programa estable funcionando