Merge pull request #2 from Hope6537/master

明天就要考操作系统了，赶紧Merge下来放松放松
Merge pull request #5 from Jichuang/master

Merge pull request #2 from Hope6537/master