Chris - 2-16-2014
Merge branch 'master' of https://github.com/TheDevilsWaffle/Team-Aluminum-Falcon-Overdrive

Conflicts:
	gamefiles/Content/__pycache__/py_bubbleLogic.cpython-32.pyc
	gamefiles/Content/__pycache__/py_cameraLogic.cpython-32.pyc
	gamefiles/Content/__pycache__/py_character_movement.cpython-32.pyc
	gamefiles/Content/__pycache__/py_collision_manager.cpython-32.pyc
	gamefiles/Content/__pycache__/py_display_splash.cpython-32.pyc
	gamefiles/Content/__pycache__/py_enemy_basic.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_objectSettings.cpython-32.pyc
	gamefiles/Content/__pycache__/py_playerController.cpython-32.pyc
	gamefiles/Content/__pycache__/py_projectileLogic.cpython-32.pyc
	gamefiles/Content/__pycache__/py_saltDropper.cpython-32.pyc
	gamefiles/Content/__pycache__/py_saltPellet.cpython-32.pyc
	gamefiles/Content/__pycache__/py_shoot.cpython-32.pyc
	gamefiles/Content/__pycache__/py_spiderController.cpython-32.pyc
	gamefiles/Content/lvl_world1.Level.data