commited by ljs
Merge branch 'master' of https://github.com/zq010/conference100