Extraño commit
Merge branch 'master' of https://github.com/ggderas/superheroes

Conflicts:
	sistemaDeHeroes/sistemaDeHeroes.v11.suo