TEST COMMIT DANIEL... SORRY GUYZ
Merge branch 'master' of https://github.com/SafetyOrange/SpaceMedusaChallenge1000

Conflicts:
	Spacewalk/Assets/Space3dStuff.meta
	Spacewalk/Assets/Space3dStuff/ChubbyStation.FBX.meta
	Spacewalk/Assets/Space3dStuff/CurvedStation.FBX.meta
	Spacewalk/Assets/Space3dStuff/EarthHighRes.FBX.meta
	Spacewalk/Assets/Space3dStuff/EarthLowRes.FBX.meta
	Spacewalk/Assets/Space3dStuff/EarthMidRes.FBX.meta
	Spacewalk/Assets/Space3dStuff/Materials.meta
	Spacewalk/Assets/Space3dStuff/Materials/01 - Default.mat
	Spacewalk/Assets/Space3dStuff/Materials/01 - Default.mat.meta
	Spacewalk/Assets/Space3dStuff/Materials/02 - Default.mat
	Spacewalk/Assets/Space3dStuff/Materials/02 - Default.mat.meta
	Spacewalk/Assets/Space3dStuff/Materials/02 - Default12.mat
	Spacewalk/Assets/Space3dStuff/Materials/02 - Default12.mat.meta
	Spacewalk/Assets/Space3dStuff/Materials/03 - Default.mat
	Spacewalk/Assets/Space3dStuff/Materials/03 - Default.mat.meta
	Spacewalk/Assets/Space3dStuff/Materials/Material #562.mat
	Spacewalk/Assets/Space3dStuff/Materials/Material #562.mat.meta
	Spacewalk/Assets/Space3dStuff/Materials/Material #57.mat
	Spacewalk/Assets/Space3dStuff/Materials/Material #57.mat.meta
	Spacewalk/Assets/Space3dStuff/Materials/Material #58.mat
	Spacewalk/Assets/Space3dStuff/Materials/Material #58.mat.meta
	Spacewalk/Assets/Space3dStuff/Materials/Material #67.mat
	Spacewalk/Assets/Space3dStuff/Materials/Material #67.mat.meta
	Spacewalk/Assets/Space3dStuff/Materials/Material #68.mat
	Spacewalk/Assets/Space3dStuff/Materials/Material #68.mat.meta
	Spacewalk/Assets/Space3dStuff/Materials/red.mat
	Spacewalk/Assets/Space3dStuff/Materials/red.mat.meta
	Spacewalk/Assets/Space3dStuff/NormalSun.FBX.meta
	Spacewalk/Assets/Space3dStuff/SeriousStation.FBX.meta
	Spacewalk/Assets/Space3dStuff/SpikySun.FBX.meta