VS is shit
Resolve conflicts

Testing... Hopefully it doesn't fuck up...
Conflicts:
	UDPClient.suo