edited by zzd.
Merge branch 'master' of https://github.com/cobble19/huasheng
merge confit
Merge branch 'master' of https://github.com/cobble19/huasheng