Adding video changes
Merge branch

Conflicts:
	app/assets/javascripts/application.js
	app/assets/stylesheets/main.css
	app/assets/stylesheets/main.scss
	app/views/devise/registrations/new.html.erb