Fixed threading issue w/ video
Merge branch 'master' of https://github.com/hymanc-umich/purpleproject1