mergegrejer
Merge branch 'master' of https://github.com/Sc4reCr0we/Ruin_Prototype into dennis

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/expandedItems
	Library/shadercompiler-1.log
drog hem mastern
Merge branch 'master' of https://github.com/Sc4reCr0we/Ruin_Prototype into dennis

Conflicts:
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.unityproj
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/metadata/03/03e962661bd38684aae252915f9d688b
	Library/metadata/51/51ead51d621334646b85a5934092ad08
	Library/metadata/c3/c3edea841b119b643b24b15022ddcc9d
	Library/shadercompiler-1.log
asdasd
Merge branch 'master' of https://github.com/Sc4reCr0we/Ruin_Prototype into dennis

Conflicts:
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.unityproj
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/shadercompiler-1.log
	Ruin_Prototype.userprefs
ljud på alla spells
Intet nytt
Merge branch 'master' of https://github.com/Sc4reCr0we/Ruin_Prototype into Helge

Conflicts:
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
	Library/assetDatabase3
	Library/expandedItems
	Library/shadercompiler-1.log