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

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

Conflicts:
	PlayerClass.py
Merge remote-tracking branch 'origin/master'