auto play for music / changed video size to match images
Merge branch

Conflicts:
	app/views/partials/_video.html.erb