scrolling background
Merge remote-tracking branch 'remotes/origin/marks' into aranda_merge

Conflicts:
	Spineless/Spineless/LevelScreen.cs
	Spineless/SpinelessContent/SpinelessContent.contentproj
Merge pull request #6 from gnomicstudios/aranda

merged in marks stuff
Helper to create box physics structure
Merge remote-tracking branch 'origin/master' into eb_physics_world

Conflicts:
	Gnomic.Core/Gnomic.csproj
	Spineless/Spineless/Spineless.csproj
Merge pull request #7 from gnomicstudios/eb_gamejam

Eb gamejam
Made princess a SpinelessEntity, added Enemy
Merge pull request #8 from gnomicstudios/aranda

Made princess a SpinelessEntity, added Enemy
Physics integrated with debug view
Merge remote-tracking branch 'origin/master' into eb_gamejam

Conflicts:
	Spineless/Spineless/Entities/SpinelessEntity.cs
Merge pull request #9 from gnomicstudios/eb_gamejam

Eb gamejam
Scaled down knight and moved border
Merge pull request #10 from gnomicstudios/eb_gamejam

Scaled down knight and moved border
Enemy manager and updated backgrounds
Merge branch 'master' of https://github.com/gnomicstudios/GGJ13 into aranda
Enemies integrated with physics
Merge pull request #11 from gnomicstudios/aranda

Updated backgrounds and added enemies
Implementing behaviour tree (W.I.P)
Merge remote-tracking branch 'origin/master' into eb_gamejam
Renamed EnemyManager to UnitManager