added code for lab5
Merge remote-tracking branch 'upstream/master'
LockingTest passes.