Made some changes
Merge branch 'master' of https://github.com/JGreggors/Castellum

Conflicts:
	Placeholder/Content/MasterPlayerContr.py
	Placeholder/Content/Placeholder.library
	Placeholder/Content/__pycache__/BatEnemy.cpython-32.pyc
	Placeholder/Content/__pycache__/CameraLogic.cpython-32.pyc
	Placeholder/Content/__pycache__/DoorLogic.cpython-32.pyc
	Placeholder/Content/__pycache__/GoblinEnemy.cpython-32.pyc
	Placeholder/Content/__pycache__/Health.cpython-32.pyc
	Placeholder/Content/__pycache__/LeverLogic.cpython-32.pyc
	Placeholder/Content/__pycache__/MasterPlayerContr.cpython-32.pyc
	Placeholder/Content/__pycache__/NoChaseBat.cpython-32.pyc
	Placeholder/Content/__pycache__/Projectile.cpython-32.pyc
	Placeholder/Content/__pycache__/Score.cpython-32.pyc
	Placeholder/Content/__pycache__/Timer1.cpython-32.pyc
	Placeholder/Content/__pycache__/smartcamera.cpython-32.pyc