blog
Merge branch 'master' of github.com:yunpengzhang/yunpengzhang.github.com

Conflicts:
	_includes/themes/twitter/default.html
	_includes/themes/twitter/page.html
	_includes/themes/twitter/post.html
	assets/themes/twitter/css/style.css