修改：      _config.yml
	修改：      _layouts/article.html
	修改：      _layouts/category.html
	修改：      _layouts/default.html
	修改：      _posts/2013-10-12-github-homepage-devlog.md
	修改：      _posts/2013-10-18-pku.pic
	新文件：    _posts/2013-10-28-computer-network.md
	新文件：    _posts/2013-10-28-introduction-to-algorithms.md
	修改：      .gitignore
	修改：      _layouts/article.html
Merge branch 'master' of github.com:harttle/harttle.github.io

Conflicts:
	_posts/2013-10-12-github-homepage-devlog.md

	修改：      _posts/2013-10-12-github-homepage-devlog.md