Configured action mailer for 3amtester@gmail.com
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/environments/production.rb