Update Slider
Fix Merge Conflicts
Revert "Fix Merge Conflicts"

This reverts commit 4994bb2f819da99f190d04a627cfb38ece2c8875.
Another try
Merge pull request #29 from asmockler/polishing-slider

Update Slider