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

Conflicts:
	Assets/Scenes/GameScene.unity
	KingWasSick.userprefs
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/expandedItems
	Library/metadata/ed/ed9d10f94fd4f4fccbf78909100483df