富勒的定律
Merge branch 'gh-pages' of https://github.com/Jnoee/blog.git into
gh-pages

Conflicts:
	_posts/2012-04-02-瀵屽嫆鐨勫畾寰�md