newComm
newComm
арврпарв
grafon
fewaf21321
Merge branch 'master' of https://github.com/RikkiRu/wcfGmae

Conflicts:
	2.txt
Grafonishe
Merge branch 'master' into RikBranch
hhhhhhhhhhhhh3not work
ierarchy!
Merge branch 'RikBranch' of https://github.com/RikkiRu/wcfGmae into RikBranch

Conflicts:
	client/client/Clientform.v12.suo
	client/client/FormMain.Designer.cs
	client/client/FormMain.cs
	client/client/bin/Debug/esufhkehfksdfkjceshk.exe
	client/client/bin/Debug/esufhkehfksdfkjceshk.pdb
	client/client/obj/Debug/Clientform.csproj.FileListAbsolute.txt
	client/client/obj/Debug/Clientform.csproj.GenerateResource.Cache
	client/client/obj/Debug/Clientform.csprojResolveAssemblyReference.cache
	client/client/obj/Debug/DesignTimeResolveAssemblyReferences.cache
	client/client/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	client/client/obj/Debug/esufhkehfksdfkjceshk.exe
	client/client/obj/Debug/esufhkehfksdfkjceshk.pdb
	server/server/Program.cs
	server/server/bin/Debug/server.exe
	server/server/bin/Debug/server.pdb
	server/server/generator.cs
	server/server/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	server/server/obj/Debug/server.csproj.FileListAbsolute.txt
	server/server/obj/Debug/server.csprojResolveAssemblyReference.cache
	server/server/obj/Debug/server.exe
	server/server/obj/Debug/server.pdb
	server/server/server.v12.suo