Merge branch 'master' of github.com:haojianzong/haojianzong.github.io

Conflicts:
	_posts/2014-11-16-a-note-of-how-to-use-auto-layout.markdown
Merge branch 'master' of github.com:haojianzong/haojianzong.github.io