Merge https://github.com/wong2/xiaohuangji-new

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/Dominator008/xiaohuangji

Conflicts:
	.gitignore
.gitignore