added trackkeeping for locks and group vector
Merge branch 'master' of github.com:chw2006/cs425-mp2