correccion errores por merge
Merge pull request #15 from galoget/reto1_errorMerge

#merged Reto1 error merge