reset
Merge branch 'master' of github2:huyong36/24point