fixed uRendezvousAcceptor
fix conflict
Merge branch 'master' of https://github.com/dkim1000/cs343

Conflicts:
	WatcardOffice.cc