help
Merge branch 'master' of
https://github.com/lchrislee/Pokeman-Parody-Adaptation.git

Conflicts:
	src/EMPTY_TEST_CLASS_DELETE_ME.java