增加代码高亮插件shBrush
Merge branch 'master' of https://github.com/daleione/daleione.github.io

Conflicts:
	_posts/2014-03-14-begin-github-pages.md