merge locah and remote
Merge branch 'master' of github.com:searchjack/note