Stuff I've been working on
Merge branch 'master' of github.com:LostCodeStudios/GGJ14
Merge branch 'master' of github.com:LostCodeStudios/GGJ14

Conflicts:
	GlobalGameJam/GlobalGameJam/GlobalGameJam/GlobalGameJam.csproj