Pokebattles

TARARRRARARMMM
PAM PAM PAM PAM(...)
Pokebattles ~feitas~
Struggle feito
Nois
Merge master Rica did it again

Fixes e merjamentos com coisas que renato fez. (>'-')>

Conflicts:
	src/Pokedata.py
	src/Pokemon.py