Updating Turret
Test - Turret Update
Merge branch 'Levels-Code-Chris'

Conflicts:
	gamefiles/Content/__pycache__/py_bubbleLogic.cpython-32.pyc
	gamefiles/Content/__pycache__/py_character_movement.cpython-32.pyc
	gamefiles/Content/__pycache__/py_clockHunter.cpython-32.pyc
	gamefiles/Content/__pycache__/py_collision_manager.cpython-32.pyc
	gamefiles/Content/__pycache__/py_globalVariables.cpython-32.pyc
	gamefiles/Content/__pycache__/py_input_manager.cpython-32.pyc
	gamefiles/Content/__pycache__/py_level_logic.cpython-32.pyc
	gamefiles/Content/__pycache__/py_mainMenu.cpython-32.pyc
	gamefiles/Content/__pycache__/py_pickupSettings.cpython-32.pyc
	gamefiles/Content/__pycache__/py_shoot.cpython-32.pyc
	gamefiles/Content/lvl_Garrett_TileMap00.bin