monkey
Merge branch 'master' of https://github.com/Metsa/KingWasSick

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Scenes/GameScene.unity
	Assets/Scripts/HutScene/Items/Cauldron.cs
	Assets/Scripts/HutScene/Items/Cauldron.cs.meta
	Assets/Scripts/ThroneScene/Items/KingRoom/KingDoorKT.cs
	Assets/Scripts/ThroneScene/Items/KingRoom/KingDoorTK.cs
	Assets/Scripts/ThroneScene/Items/ServantRoom/ServantDoorST.cs
	Assets/Scripts/ThroneScene/Items/ServantRoom/ServantDoorTS.cs
	KingWasSick.userprefs
	Library/CurrentMaximizeLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/expandedItems
	Library/guidmapper
	Library/metadata/4e/4ea4a9398ec7049dda9687d1cf7d9bb9
	Library/metadata/73/73b08b6f12be24ba29768fd47d1d080a
	Library/metadata/90/90400aed9cdc440ac9063ecc60818532
	Library/metadata/96/965f3b2802f244ad4a5f0796abd0c4f5
	Library/metadata/cd/cd32a8495849342e18eef7bd720e4e84
	Library/metadata/d3/d391b842de763411897c69ab1185312d
	Library/metadata/d9/d9d110114546f4b29aa58dd14ae464a3
	Library/metadata/ea/ea9eb011e754749fa806e089d5c2a2d7