jb
Merge branch 'master' of https://github.com/xiaokaike/xiaokaike.github.com

Conflicts:
	_layouts/default.html
	_layouts/page.html
	_layouts/post.html