Changed JS in index.html
Fixed merge
Fixed mike's swag dog function
Merge branch 'master' of https://github.com/garrettdreyfus/Virvideo