new style of note class
Merge branch 'master' of github.com:PublicFess/3
unknow commit
unknow commit
unknown commit
commit after merge