Merge pull request #26 from aledruetta/master

Semana 4 (incompleto) y Desafío 1