Revert "update"

This reverts commit cba0563712bd2668504c164d7a1c9f4752c7f150.
ROLLBACK
Revert "ROLLBACK"

This reverts commit ba18e3aa0a9806ffecc5c12b2191b99128e760c6.
Revert "Revert "ROLLBACK""

This reverts commit d943577561bbc8db9ad66b3e26fab534d7fba837.
Merge branch 'master' of https://github.com/zq010/conference100