finished slider
Merge branch 'slider'
Merge branch 'master' of https://github.com/StevenHarlow/shakeventure