updated trilock test
cleaned up comments
Merge branch 'master' of https://github.com/fchoo/lab4