merge before pull
Merge branch 'master' of https://github.com/jreddeko/cmput410-project
fixed stuff to work for video
Merge branch 'master' of https://github.com/jreddeko/cmput410-project