1
Merge branch 'master' of https://github.com/hanxiaomax/hanxiaomax.github.io

Conflicts:
	_config.yml
	_includes/footer.html
	_includes/scripts.html
	_layouts/page.html
	_layouts/post.html
	_posts/2013-08-16-doctor-2.md