update
Merge branch 'master' of github.com:RichardNi/mynote

Conflicts:
	note/README.md
	note/linux/README.md