修改markdown配置
Merge branch 'master' of https://github.com/fishguo321/fishguo321.github.com

Conflicts:
	_config.yml