Health, Compass
Merge branch 'master' of https://github.com/yhchun1992/PixelJam2014

Conflicts:
	PixelJam2014/Assembly-CSharp-vs.csproj
	PixelJam2014/Assembly-CSharp.csproj
	PixelJam2014/Assets/Assets/Environment/LandMarks/LandMark_3.fbx.meta
	PixelJam2014/Assets/Assets/Environment/LandMarks/LandMark_4.fbx.meta
	PixelJam2014/Assets/Assets/Environment/LandMarks/Materials/blinn1.mat
	PixelJam2014/Assets/Assets/Environment/LandMarks/Materials/blinn1.mat.meta
	PixelJam2014/Assets/Assets/Environment/LandMarks/Materials/blinn2.mat
	PixelJam2014/Assets/Assets/Environment/LandMarks/Materials/blinn2.mat.meta
	PixelJam2014/Assets/Assets/Environment/LandMarks/Materials/blinn3.mat
	PixelJam2014/Assets/Assets/Environment/LandMarks/Materials/blinn3.mat.meta
	PixelJam2014/Assets/Assets/Environment/LandMarks/Materials/lambert2.mat
	PixelJam2014/Assets/Assets/Environment/LandMarks/Materials/lambert2.mat.meta
	PixelJam2014/PixelJam2014-csharp.sln
	PixelJam2014/PixelJam2014.sln