WIP view video test page
resolved merge conflict
Merge pull request #10 from JasonBenn/viewing_video

WIP view video test page