add
coolMerge branch 'master' of https://github.com/bsdshell/note