Initial commit
Merge branch 'master' of https://github.com/liguozhang/blog

Conflicts:
	README.md