Refactored video rendering into a Handlebars template
Load from heroku, not localhost
Merge branch 'master' of github.com:swestwood/cs247-final

Recompiled Coffeescript

Conflicts:
	bookmarklet/compiled/templateHtml.js