My greatest fear is that source control does not source control
Merge branch 'master' of https://github.com/nkornek/improvgame

Conflicts:
	Improv Game/Assets/Models/Character2.fbx.meta
	Improv Game/Assets/Models/Materials/No Name.mat.meta
	Improv Game/Improv Game-csharp.sln
	Improv Game/Improv Game.sln
	Improv Game/Library/CurrentLayout.dwlt
	Improv Game/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Improv Game/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Improv Game/Library/assetDatabase3
	Improv Game/Library/expandedItems
	Improv Game/Library/guidmapper
	Improv Game/Library/metadata/12/12e46cd90ce883241a75aca9e52c3bfc
	Improv Game/Library/metadata/43/43a398a90579a94459f34cb02ca99203
	Improv Game/Library/metadata/4d/4d149c2492330114cab8f09ac8562a73