js getting loaded twice because of assets and inclusion here, removed
for now
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/catalog/_show_list_tufts_video.html.erb
startup didn't like my placeholder characters
added webm streams
added route for webm
ignore webm