added locks that I forgot.
Merge branch 'master' of https://github.com/regehr/advanced_os_class