working on lab 5 ex1
Lock test passes
Merge pull request #25 from lyeary/master

merge
Merge pull request #9 from farahfouladi/master

merge