upd
Merge branch 'master' of https://github.com/zyxstar/markdown_note

Conflicts:
	GENERATE_README.py
	README.md