Created Army Ant

Created an .ai file for the Army Ant enemy, added a mockup, and also 3
sprites: one that is whole, and the others are parts for Chris to
manipulate.
-Travis
Added Army Sprites to Zero

CHRIS, PLEASE READ: the sprites are: spr_army_ant_whole - use this for
testing, then also spr_army_ant_hill as the base, and spr_army_gun as
the movable/flipable part for your turret. See me if you have questions.
-Travis
Merge branch 'turret-assets-branch'
Created Lightning Potion Sprite

Created the lightning potion sprite and updated the powerups .ai file.
-Travis
Put Lightning potion in zero
Merge branch 'powerups-branch'

Conflicts:
	gamefiles/Content/__pycache__/py_character_movement.cpython-32.pyc
	gamefiles/Content/__pycache__/py_level_logic.cpython-32.pyc
	gamefiles/Content/__pycache__/py_pickupSettings.cpython-32.pyc
Lightning work

Art asset added
Merge branch 'master' of https://github.com/TheDevilsWaffle/Aluminum-Falcon-Overdrive
Lightning Power Up (work in progress)

can't test because of Nonetype error with snail jumping in
character_movement script
Mostly Comments

Committed Commenting.
Lightning work

Its persistent!
Created Ice Projectile and Fireblast sprites

Mockups in the mockups folder and actual sprites in the
artfiles->sprites->powerups folder.
-Travis
Added Ice and Fire projectile sprites to Zero

Read above.
-Travis
Merge branch 'powerups-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_level_logic.cpython-32.pyc
	gamefiles/Content/__pycache__/py_pickupSettings.cpython-32.pyc
	gamefiles/Content/__pycache__/py_wall_sticky.cpython-32.pyc
trail working, bug fixes

sCargo is no longer enemy, projectiles work on ice blocks