Desktop_note NO.1
Merge branch 'master' of github.com:diaohen/Desktop_note