Merge pull request #1 from guanlun/master

pulling
Merge pull request #2 from guanlun/master

remove git merge files
reflection
Merge pull request #3 from liligeng111/master

reflection
 merged