bug zlj
Merge branch 'master' of github.com:zq010/conference100