a few changes
Merge branch 'master' of https://github.com/qujiaqing/ComputerNetworkPJ3

Conflicts:
	project3_starter_code/peer.h
	project3_starter_code/peer.h~