Woops, fixed locks.
Merge branch 'master' of github.com:regehr/advanced_os_class