Initial commit
test new email settings
Add configuration for smtp.umbc.edu emails
delete .idea folder (ide settings) and update .gitignore
Merge conflicts from origin and and production code

Conflicts:
	.gitignore
	app/mailers/service_mailer.rb
	config/environments/production.rb