...
Merge branch 'master' of https://github.com/SebMeGizle/GayManfred2

Conflicts:
	game/Assembly-CSharp-vs.csproj
	game/Assembly-CSharp.csproj
	game/Assets/scenes/main scene.unity
	game/Assets/scripts/playerControls.cs
	game/Library/CurrentLayout.dwlt
	game/Library/ScriptAssemblies/Assembly-CSharp.dll
	game/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	game/Library/assetDatabase3
	game/Library/guidmapper
	game/Library/metadata/76/76ed4c60bde3f40129697836678e7727
	game/game-csharp.sln
	game/game.sln
	game/game.userprefs