fix
test
Merge branch 'master' of github.com:hugohu/hugohu.github.io
test
Merge branch 'master' of github.com:hugohu/hugohu.github.io

Conflicts:
	_posts/2012-10-18-%e6%98%a8%e5%a4%a9%ef%bc%9adom%e5%b8%b8%e7%94%a8%e5%af%b9%e8%b1%a1%e7%9a%84%e5%b1%9e%e6%80%a7%e5%92%8c%e6%96%b9%e6%b3%95.md