before pull
Merge branch 'master' of github.com:Shahdee/dragon

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
before merge
Merge branch 'master' of github.com:Shahdee/dragon

Conflicts:
	Assets/player/golem/Materials/golem.mat
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/metadata/39/39f8be95c9d211944b1dff96addf480d
	Library/metadata/43/434f6b4303fa0414d8cbfe8a88bd3cc4
BLA BLA