I done goofed
asd
Merge branch 'master' of https://github.com/Sc4reCr0we/Ruin_Prototype into Helge

Conflicts:
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.unityproj
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.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
	ProjectSettings/EditorBuildSettings.asset
	Ruin_Prototype.userprefs