Merge pull request #1 from Horace-G/master

Cambios Nuevo
Avanze final
Merge pull request #41 from 11241069/master

Avanze