added sliders
Merge pull request #36 from cathyatseneca/issue13-slider

added sliders
fixed conflicts