Stage 2 changes
Conflict resolution

Conflicts:
	Program.cs
	UDPClient.suo
	bin/Debug/UDPClient.exe
	bin/Debug/UDPClient.pdb
	obj/x86/Debug/UDPClient.exe
	obj/x86/Debug/UDPClient.pdb