.
Merge branch 'master' of https://github.com/DebateClub/DebateClub

Conflicts:
	Library/CurrentLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
.
Merge branch 'master' of https://github.com/DebateClub/DebateClub

Conflicts:
	Assets/scene.unity
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	ProjectSettings/TagManager.asset
added Character.cs