add
Merge branch 'gh-pages' of https://github.com/lijiaocn/blog into gh-pages

Conflicts:
	_posts/2014-06-23-Linux鎬ц兘璋冧紭.md