add words
merge origin and local
Merge branch 'master' of https://github.com/dear531/desktop_edit_log_note