added lock manager
Merge branch 'master' of github.com:nrc2105/databases-final-project