fix to change weapon
Merge pull request #34 from gnomicstudios/marks

fix to change weapon
work-in-progress
Merge pull request #35 from gnomicstudios/aranda

Aranda
work-in-progress
Merge pull request #36 from gnomicstudios/marks

Marks
Enemy AI state machine
Merge branch 'master' of https://github.com/gnomicstudios/GGJ13 into aranda

Conflicts:
	Spineless/Spineless/UnitManager.cs