test

test
Merge remote-tracking branch 'BoxX/master'
let's have a drink

小改动 纠结与scrollview的最小滑动参数
Merge pull request #8 from fnjnkn/master

小改动