lkist srv
srv list
Merge branch 'master' of https://github.com/Steinhagen/5inarow

Conflicts:
	Client/bin/Debug/Client.exe
	Client/bin/Debug/Client.pdb
	Client/obj/Debug/Client.csproj.FileListAbsolute.txt
	Client/obj/Debug/Client.csprojResolveAssemblyReference.cache
	Client/obj/Debug/Client.exe
	Client/obj/Debug/Client.pdb
	Client/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Connection/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	PARC.v12.suo
	Server/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Server/obj/Debug/Server.csproj.FileListAbsolute.txt