Working on output
Merge branch 'master' of https://github.com/Shaman16x/OSProject
Fixed a lot of error.  Added a toString method to Lock