Revert "new1"

This reverts commit f746cd01614e10802efb5f2841c0d8bfde76c5ec.
Revert "Revert "new1""

This reverts commit 47f0a7464cf01962af621cf856750b3c27b72f5c.
Merge branch 'master' of https://github.com/MTime90/HuangZhiheng