kommer inte ihåg!
Merge branch 'master' of https://github.com/Sc4reCr0we/Ruin_Prototype

Conflicts:
	Assets/Helge.unity
	Assets/Scripts/Player/slotManager.cs
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
	Library/InspectorExpandedItems.asset
	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/assetDatabase3
	Library/expandedItems
	Library/metadata/ba/ba62649bd5d34a74cbb2fc7735e7c920
	Library/shadercompiler-1.log
	ProjectSettings/EditorBuildSettings.asset
	Ruin_Prototype.userprefs
Lagt till fmod banken. Vissa placeholders sitter på spells
Merge branch 'master' of https://github.com/Sc4reCr0we/Ruin_Prototype into dennis

Conflicts:
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
	Library/InspectorExpandedItems.asset
	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/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/ba/ba62649bd5d34a74cbb2fc7735e7c920
	Library/shadercompiler-1.log
	Ruin_Prototype.userprefs
mergegrejer
mer ljudpill
Added particles and statuseffect
Merge branch 'master' of https://github.com/Sc4reCr0we/Ruin_Prototype

Conflicts:
	Assets/Scripts/Player/slotManager.cs
	Library/AssetServerCacheV3
	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/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/07/07951255d2d525a45bb2ecd43db55ad6
	Library/metadata/ba/ba62649bd5d34a74cbb2fc7735e7c920
	Library/shadercompiler-1.log
	Ruin_Prototype.userprefs
pushing Martin
Smiley MF BOMB!!!!! och lite annat
Merge branch 'master' of https://github.com/Sc4reCr0we/Ruin_Prototype into Helge

Conflicts:
	Assets/Helge.unity
	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/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/ba/ba62649bd5d34a74cbb2fc7735e7c920
	Library/shadercompiler-1.log
	Ruin_Prototype.userprefs
prepare for pull master
added lots of shiet, direction and other stuff
Merge branch 'master' of https://github.com/Sc4reCr0we/Ruin_Prototype into martin

Conflicts:
	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/assetDatabase3
	Library/expandedItems
	Library/metadata/ba/ba62649bd5d34a74cbb2fc7735e7c920
	Library/shadercompiler-1.log
added EMP and working stateController