Merge branch 'master' of github.com:yuanboshe/yuanboshe.github.com

Conflicts:
	blog/2013-10-restructuretext_sphinx_resource.html
	blog/2013-10-select_personal_websit_solution.html
	blog/categories.html
	blog/category/webqian-duan.html
	blog/dates.html
	blog/index.html
	blog/tag/github.html
	blog/tag/pelican.html
	blog/tag/restructuredtext.html
	blog/tag/sphinx.html
	blog/tags.html
	drafts/assemble_your_turtlebot1.html
	drafts/test.html
	index.html
Merge branch 'master' of github.com:yuanboshe/yuanboshe.github.com

Conflicts:
	blog/2013-10-restructuretext_sphinx_resource.html
	blog/2013-10-select_personal_websit_solution.html
	blog/categories.html
	blog/category/webqian-duan.html
	blog/dates.html
	blog/index.html
	blog/tag/github.html
	blog/tag/pelican.html
	blog/tag/restructuredtext.html
	blog/tag/sphinx.html
	blog/tags.html
	drafts/assemble_your_turtlebot1.html
	drafts/test.html
	index.html