Merge pull request #1 from JavierHevia93/Tarea3_201313898

Tarea3 201313898
Merge pull request #2 from JavierHevia93/master

Tarea3_201313898