.
Merge branch 'master' of https://github.com/javiergra/SaladilloHeroesTeam2.git
Arreglos y limpieza en general (refactor y format)