client
Merge branch 'master' of https://github.com/thebillkidy/INF202A_DotNetDeel2

Conflicts:
	CategoryC/CategoryC.suo
	CategoryC/Client/bin/Debug/Client.exe
	CategoryC/Client/bin/Debug/Client.pdb
	CategoryC/Client/obj/x86/Debug/Client.csproj.FileListAbsolute.txt
	CategoryC/Client/obj/x86/Debug/Client.exe
	CategoryC/Client/obj/x86/Debug/Client.pdb
	CategoryC/Server/bin/Debug/Server.exe
	CategoryC/Server/bin/Debug/Server.pdb
	CategoryC/Server/obj/x86/Debug/Server.csproj.FileListAbsolute.txt
	CategoryC/Server/obj/x86/Debug/Server.exe
	CategoryC/Server/obj/x86/Debug/Server.pdb