changed slider
Merge branch 'master' of https://github.com/calvinwchan/HoppyApp
merge changes