Merge branch 'Uchiha'
cambios menores
Merge branch 'master' into Uchiha