first start on turkeys
Merge remote-tracking branch 'upstream/master' into jive-turkeys
Merge remote-tracking branch 'upstream/master' into jive-turkeys
continued
Merge remote-tracking branch 'upstream/master' into jive-turkeys

Conflicts:
	src/nodes/enemy.lua
jive
created new generic projectile
converted baseball to accept new projectile
added jhoff's snippet which allows the end of node collisions to be monitored
added far too many manicorns to gay island
shoot items from torso
significantly reduced capabilities of the manicorn
added an option for projectiles to have a location where they're held
expanded height of rainbowbeam projectile
reverting enemy testing
reverting enemy testing
Merge remote-tracking branch 'origin/manicorn_enemy' into manicorn_enemy
kill rainbow beams after extended disuse
WIP
WIP
reverting changes
Merge branch 'master' into manicorn_enemy

Conflicts:
	make.bat
	src/nodes/enemy.lua
	src/player.lua