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

Conflicts:
	Assets/Scenes/GameScene.unity
	KingWasSick.userprefs
	Library/CurrentMaximizeLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper