rename
Merge branch 'gh-pages' of https://github.com/king1991wbs/wilson into gh-pages

Conflicts:
	CNAME
	_posts/2012-08-25-hello-word.html