no change
Merge branch 'nathan_devise_omni'
Merge branch 'master' into github-signin-testing

Conflicts:
	app/controllers/omniauth_callbacks_controller.rb
	app/models/user.rb
	app/views/devise/registrations/new.html.erb