Heart beat
Merge branch 'master' of https://github.com/gnomicstudios/GGJ13 into aranda

Conflicts:
	Spineless/Spineless/Entities/Princess.cs
	Spineless/Spineless/LevelScreen.cs
	Spineless/Spineless/UnitManager.cs
	Spineless/SpinelessContent/SpinelessContent.contentproj
Merge pull request #29 from gnomicstudios/aranda

Heart mechanic and merges