lalala
Merge branch 'master' of github.com:jesusnoseq/TakaraHunter

Conflicts:
	superusuario.txt