Merge branch 'master' of https://github.com/gnomicstudios/GGJ13 into aranda
Merge pull request #31 from gnomicstudios/marks

princess states
Updated background.. started unit lanes
Merge branch 'master' of https://github.com/gnomicstudios/GGJ13 into aranda

Conflicts:
	Spineless/Spineless/Entities/SpinelessEntity.cs
	Spineless/Spineless/ProjectileManager.cs
Merge pull request #32 from gnomicstudios/aranda

Updated background.. started unit lanes
work-in-porgress
merged