setting up mailgun
removed mail.rb
rm user mailer
fixing mailgun
Merge branch 'mailgun'

Conflicts:
	app/controllers/incoming_controller.rb
	config/routes.rb