added some fixes to the slider
Merge branch 'master' of https://github.com/Stringsy/team-project
Merge branch 'master' of github.com:Stringsy/team-project