Work in Progress for game background

Not there yet
Level Work

Added Barriers to Levels.
bug fixing

YAY
Merge Fixes

Fixed
Barriers

Added barriers to all of my levels
Massive Tiles Update

Created a butt-load of new tiles to help with connecting odds and
ends...
Merge branch 'grass-dirt-palette'
Salt Dropper/Lightning fix

I think
Lightning Timer

The lightning power up now has a cool down.
Merge branch 'master' of https://github.com/TheDevilsWaffle/Aluminum-Falcon-Overdrive
Added New Tile Pallettes

PLEASE READ: This update should not break current levels. There are
three *NEW* tile pallets:
dirt_palette_updated
grass_palette_updated
stone_palette_updated

Use these palettes from now on to have access to all the odds and ends
corner pieces.
-Travis
Merge branch 'master' of https://github.com/TheDevilsWaffle/Aluminum-Falcon-Overdrive

Conflicts:
	gamefiles/Content/__pycache__/py_clockHunter.cpython-32.pyc
	gamefiles/Content/__pycache__/py_input_manager.cpython-32.pyc
Corrected dark corner tile sprites
Merge branch 'grass-dirt-palette'

Conflicts:
	artfiles/illustrator/tilemaps/snail-tiles-ver04.ai
Nuther Level

Nuff said. Or: Lvl G6 is now in the game
Once More, With Feeling…

More big palette changes in the form of corrections. Now there is a
newer version of the tile palettes for dirt, grass, and stone. You'll be
able to see where it is.
Also, made a correction to the main menu using the new stone.
-Travis
Merge branch 'master' of https://github.com/TheDevilsWaffle/Aluminum-Falcon-Overdrive

Conflicts:
	gamefiles/Content/__pycache__/py_bouncyBall.cpython-32.pyc
	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_enemy_basic.cpython-32.pyc
	gamefiles/Content/__pycache__/py_enemy_fly.cpython-32.pyc
	gamefiles/Content/__pycache__/py_enemy_turret.cpython-32.pyc
	gamefiles/Content/__pycache__/py_globalVariables.cpython-32.pyc
	gamefiles/Content/__pycache__/py_iceBlock.cpython-32.pyc
	gamefiles/Content/__pycache__/py_input_manager.cpython-32.pyc
	gamefiles/Content/__pycache__/py_launcher.cpython-32.pyc
	gamefiles/Content/__pycache__/py_level_logic.cpython-32.pyc
	gamefiles/Content/__pycache__/py_mainMenu.cpython-32.pyc
	gamefiles/Content/__pycache__/py_objectSettings.cpython-32.pyc
	gamefiles/Content/__pycache__/py_pickupSettings.cpython-32.pyc
	gamefiles/Content/__pycache__/py_projectileLogic.cpython-32.pyc
	gamefiles/Content/__pycache__/py_sCargo.cpython-32.pyc
	gamefiles/Content/__pycache__/py_saltDropper.cpython-32.pyc
	gamefiles/Content/__pycache__/py_snail_animations.cpython-32.pyc
	gamefiles/Content/__pycache__/py_wall_sticky.cpython-32.pyc
Corrected Snail Falling Sprites

Saved out new power up falling sprites, added them to zero, and updated
the origin points to match the normal snail.
-Travis
Merge branch 'animation-controller-branch'

Conflicts:
	gamefiles/Content/__pycache__/py_character_movement.cpython-32.pyc
	gamefiles/Content/__pycache__/py_clockHunter.cpython-32.pyc
	gamefiles/Content/__pycache__/py_globalVariables.cpython-32.pyc
	gamefiles/Content/__pycache__/py_iceBlock.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_projectileLogic.cpython-32.pyc
	gamefiles/Content/__pycache__/py_sCargo.cpython-32.pyc
interim commit

WoooWeeee