arreglo error merge
Merge branch 'Desarrollo' of https://github.com/manu10/teamRocket into Desarrollo