Merge branch 'master' into design
Merge remote-tracking branch 'origin/master' into design
Merge branch 'master' of github.com:txsl/hipflask into design
Fixed init and video.html
Fixed skeleton HTML (static was not /static) and started /video/<vid>
Added comments to vide!!o
Merge branch 'master' of github.com:txsl/hipflask into design