xml test
Merge remote-tracking branch 'origin/master'

Conflicts:
	Tests/test_PokeXmler.py
xml test