funcionaaaaa
????
Merge branch 'master' of https://github.com/giordanna/Pokemon

Conflicts:
	._README.md