added some shit
Merge branch 'master' of github.com:alexkau/OpSysProject1