Merge branch 'gh-pages'
adding video test page
removed youtube time
Merge branch 'master' into gh-pages