Fixed the fucking parser with the fucking dictionary
Merge branch 'master' of https://github.com/hirohaya/huemon

Conflicts:
	pokemon.xml
	xml_pokemon.py