stuff is implemented with errors
Merge branch 'master' of https://github.com/Shaman16x/OSProject
added things to Lock.java to maintain highest priority