rescue from failed hard drive
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/custom.css.scss
	app/controllers/users_controller.rb
	app/mailers/user_mailer.rb
	app/views/layouts/_navbar.html.erb
	app/views/pages/character.html.erb
	app/views/pages/concept.html.erb
	app/views/pages/contact.html.erb
	app/views/pages/previz.html.erb
	app/views/pages/storyboard.html.erb
	app/views/pages/vfx.html.erb
	app/views/users/_user.html.erb
	app/views/users/index.html.erb
	db/schema.rb