Server Code Updates

Server now has a game class that will manage a match between two
players.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Guardians of the Arena/Guardians of the Arena-csharp.sln
	Guardians of the Arena/Guardians of the Arena.sln
	Guardians of the Arena/Library/CurrentLayout.dwlt
	Guardians of the
Arena/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Guardians of the
Arena/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Guardians of the Arena/Library/ScriptAssemblies/Assembly-CSharp.dll
	Guardians of the Arena/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Guardians of the
Arena/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Guardians of the
Arena/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Guardians of the Arena/Library/assetDatabase3
	Guardians of the Arena/Library/expandedItems
	Guardians of the Arena/Library/guidmapper
	Guardians of the
Arena/Library/metadata/1e/1ebf449f4fc05a94d9ff2a470c78b1d1
	Guardians of the
Arena/Library/metadata/79/790d2738b50bed24ea438f82aa7cdbf8
	Guardians of the
Arena/Library/metadata/7a/7a7de16b8802c5e40b249da60e970a14
	Guardians of the
Arena/Library/metadata/8d/8d53b5c709e432445967797a1da89597
	Guardians of the
Arena/Library/metadata/96/962b0f6b076362f46bbedf20d851f942
	Guardians of the
Arena/Library/metadata/d0/d09b4f10c8a215347bbcd9e1923b9a50
	Guardians of the Arena/Library/shadercompiler-1.log