edit
Merge branch 'master' of github.com-tbl123:marginal-slider/marginal-slider