final version
Merge branch 'master' of https://github.com/junk2112/os
final version