Fixing solution
Merge branch 'master' of github.com:LostCodeStudios/GGJ14

Conflicts:
	GlobalGameJam/GlobalGameJam/GlobalGameJam/GlobalGameJam.csproj
	GlobalGameJam/GlobalGameJam/GlobalGameJamContent/GlobalGameJamContent.contentproj