j
Merge remote-tracking branch 'origin'
Merge pull request #8 from suntinghui/master

Jia
Merge remote-tracking branch 'origin'
d
Merge pull request #13 from liaojia/master

删除卡拉刷新