fixes video and adds slider
Merge branch 'master' of https://github.com/dylanmcgowan/sandy