添加代码
Merge branch 'master' of https://github.com/ghostzhang/ghostzhang.github.io.git

Conflicts:
	_posts/鎶€鏈?鐮旂┒/2014-09-02-濂囨€?鐨勯?滆壊.md