just moving computers.
And moving to school.
Merge remote-tracking branch 'origin/ProtoConnection---connection-stats'

Conflicts:
	test client/main.cpp
	test client/test client.vcxproj
	test client/test client.vcxproj.filters
	test/main.cpp
	test/test.vcxproj.filters

Merged