Merge branch 'master' of github.com:mygoare/slider
Merge branch 'master' of github.com:mygoare/slider