Changed variable names to conform with phagex changes
Fixed merge conflicts
Merge branch 'master' of https://github.com/spfrommer/platformer

Conflicts:
	src/platformer/PlayerScript.py