Audio plays. Video remains unscrubbable

Signed-off-by: notrodash <n@notr.co>
Merge branch 'master' of https://github.com/notrodash/URL-Badmans--YRS-2014-

Signed-off-by: notrodash <n@notr.co>

Conflicts:
	project/templates/project.html
Merged a thing

Signed-off-by: notrodash <n@notr.co>