init
Merge branch 'master' of github.com:xiongbo/blog
update readme

Conflicts:
	.gitignore