init commit
Merge branch 'master' of github.com:xiaoxinghu/xiaoxinghu.github.io

Conflicts:
	.gitignore