slider重构
Merge branch 'master' of https://github.com/yzsolo/slider

Conflicts:
	src/slider.js