xiongbo's prerequisite task
Merge pull request #50 from xiongbo/master

xiongbo's prerequisite task
solve conflict
Merge branch 'master' of https://github.com/tuoxiaozhong/prerequisite