redo
Merge pull request #56 from pibemillo/master

Gonzalo Homework Redo