somewhat working
Merge branch 'master' of https://github.com/jgernz/OperatingSystems
somewhat working