bug fix
Merge branch 'master' of https://github.com/rolivia/OS-Project
add functions fix bugs