video changes
Merge branch 'master' into matt
merge
Merge pull request #1 from MatthewKam/matt

Matt