测试blog的md解析效果
Merge branch 'master' of github.com:shjanken/shjanken.github.io

Conflicts:
	_posts/2014-04-24-lvs_学习笔记.md