Merge pull request #1 from weiShine/master

scrolling merge
commit
Merge pull request #1 from dacaiguoguo/master

mergePull