rm test
reset
Merge branch 'master' of https://github.com/changyeyu/changyeNote