do the project again
remove conflict
Merge pull request #69 from xiaoguizi87/master

do the project again