Merge branch 'gh-pages' of https://github.com/liuan/choudan into gh-pages

Conflicts:
	_posts/2013-8-12-OpenStack-Small-Tests.md
supplyment some contents