Unstable crap
Merge branch 'master' of https://github.com/Sc4reCr0we/RuinPrototype into Helge

Conflicts:
	Assets/Helge.unity
	Assets/Scripts/Player/PlayerMovement.cs
	Assets/Scripts/Player/PushbackScript.cs
	Library/CurrentLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/metadata/82/828d318b4134dee4ca346e10a4b001c6
	Library/metadata/d4/d40f221ea1e6c1943ab40d51fc41259a
Massa elektricitet
Merge branch 'master' of https://github.com/Sc4reCr0we/RuinPrototype into Helge

Conflicts:
	Library/CurrentLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/82/828d318b4134dee4ca346e10a4b001c6
	Library/metadata/d4/d40f221ea1e6c1943ab40d51fc41259a
	ProjectSettings/TagManager.asset
	RuinPrototype.userprefs