Analysis client added
again
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of git@github.com:pmanko2/512_project.git
Merge branch 'master' of git@github.com:pmanko2/512_project.git
changes to lockmanager