Made Logging print out appropriate info
Merge branch 'master' of https://github.com/Shaman16x/OSProject
stuff