ble
Merge branch 'master' of https://github.com/Leikjahopur/TheGame

Conflicts:
	HumanStackingTheRaceToSpace/Assembly-CSharp-firstpass-vs.csproj
	HumanStackingTheRaceToSpace/Assembly-CSharp-firstpass.csproj
	HumanStackingTheRaceToSpace/Assets/Standard Assets/HSP GimpFiles.meta
	HumanStackingTheRaceToSpace/Assets/Standard Assets/HSP GimpFiles/hinge.xcf.meta
	HumanStackingTheRaceToSpace/Assets/Standard Assets/HSP GimpFiles/plank.xcf.meta
	HumanStackingTheRaceToSpace/Assets/Standard Assets/HSP GimpFiles/water.xcf.meta
	HumanStackingTheRaceToSpace/HumanStackingTheRaceToSpace-csharp.sln
	HumanStackingTheRaceToSpace/HumanStackingTheRaceToSpace.sln
aftur
sdf
Merge branch 'master' of https://github.com/Leikjahopur/TheGame

Conflicts:
	HumanStackingTheRaceToSpace/HumanStackingTheRaceToSpace-csharp.sln
	HumanStackingTheRaceToSpace/HumanStackingTheRaceToSpace.sln
playergui txt
playergui and score
playergui and score