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
Merge pull request #37 from gnomicstudios/aranda

Enemy AI state machine
enemy fixes
Merge pull request #38 from gnomicstudios/aranda

enemy fixes
work-in-progress