更新
Merge branch 'master' of https://github.com/VS-Studio/vs-note

Conflicts:
	README.md