Code cleanup #1
Merge remote-tracking branch 'origin/master'

Conflicts:
	pokemonClass.php