created .gitignore; added bin/ and obj/ for both client and server
Create README.md
Merge branch 'master' of https://github.com/TheDizzler/space-union into MikhailServer
Fixing branch
Merge branch 'MikhailServe' of https://github.com/TheDizzler/space-union into MikhailServer

Conflicts:
	Server/TestServer/TestServer/Program.cs
	Server/TestServer/TestServer/bin/Debug/TestServer.exe
	Server/TestServer/TestServer/bin/Debug/TestServer.pdb
	Server/TestServer/TestServer/obj/Debug/TestServer.csprojResolveAssemblyReference.cache
	Server/TestServer/TestServer/obj/Debug/TestServer.exe
	Server/TestServer/TestServer/obj/Debug/TestServer.pdb