updated the user mailer rb
updated user emails
updated the email messaging
removed user controller
Merge branch 'kb_branch'

Conflicts:
	app/assets/stylesheets/style.css.scss
	app/controllers/users_controller.rb
	app/models/message.rb
	app/views/layouts/_header.html.erb
	db/schema.rb
fixed up the messages controller
updated the messages controller to have the message controller functions
removed the message controller
completed git pull