Stuff I forgot to commit ages ago
Merge branch 'master' of github.com:Manak/juketube