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

Conflicts:
	imgs/bawang01.jpg