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

Conflicts:
	Library/assetDatabase3
	Library/guidmapper
Merge branch 'master' of https://github.com/DebateClub/DebateClub

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

Conflicts:
	Library/guidmapper
improved Movement
Merge branch 'master' of https://github.com/DebateClub/DebateClub

Conflicts:
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
Added Combat Script
Merge branch 'master' of https://github.com/DebateClub/DebateClub

Conflicts:
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
Added Combat Module to player