massive video changes
Merge branch 'master' of https://github.com/NeilCBAndrews/CS317Assignment3