update
update
update
update
update
Merge branch 'master' of https://github.com/jiangjianxiao/blog

Conflicts:
	content/google_docs_note.rst