Added pair videos/quizzes! Also rejiggered CSS to work with videos.
Merge branch 'master' of https://github.com/swestwood/proto1-cs247-p3

Conflicts:
	public/javascript/main.coffee
	public/stylesheets/main.less
	views/index.handlebars