Merge branch 'master' of https://github.com/DiscoBizzle/Ghost-Simulator

Conflicts:
	PlayerClass.py