lab4
Updating lab4. Details about the update are availabe on Piazza, if necessary.
Merge branch 'lab3' into lab4

Conflicts:
	lock_protocol.h
	lock_smain.cc
	rpc/rpc.h