finishing touches
Merge branch 'master' of github.com:ormnv/os_final_project