I hope there are no merge conflicts
Merge branch 'master' of https://github.com/Brolita/OpSysHomework2