code edit typo
Merge branch 'master' of https://github.com/vidcode/VidCode
scrubbing works
Merge branch 'master' of https://github.com/vidcode/VidCode
merging