got unlock/lock to work.
Merge branch 'master' of https://github.com/brianherman/cs342project5.git
almost done.