Action mailer works, shows successes and fails on index page.
Merge branch 'master' of https://github.com/lexalexander10/seoTool

Conflicts:
	app/controllers/users_controller.rb
	app/views/user_mailer/welcome_email.html.erb
	app/views/users/_form.html.erb
	app/views/users/index.html.erb
	app/views/users/new.html.erb