Necessary commit
Merge branch 'master' of https://github.com/tsallee/Minix
Merge branch 'master' of https://github.com/tsallee/Minix
Merge branch 'master' of https://github.com/tsallee/Minix
Merge branch 'master' of https://github.com/tsallee/Minix
fixed merge conflict