格式修改
Merge branch 'master' of cfanlife:cfanlife/cfanlife.github.io

Conflicts:
	_posts/2014-06-30-JavaScript-1.md