'Video contest part 1'
Merge branch 'master' of github.com:BrooksPatton/refactoru