diff --git a/config/environments/development.rb b/config/environments/development.rb
index 55f465a..b66cd7f 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -32,5 +32,9 @@ Wrestling::Application.configure do
 	#Bullet.alert = true
 	#Bullet.console = true
 	#Bullet.bullet_logger = true
+	
+	
+
+
   end
 end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 1473109..4e3d80b 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -97,14 +97,17 @@ Wrestling::Application.configure do
   #Added by me to force SSL in production
   config.force_ssl = true
   
-  #Mail
-  config.action_mailer.delivery_method = :smtp
-    config.action_mailer.smtp_settings = {
-      :address => "localhost",
-      :port => 25,
-      :domain => "wrestlingdev.com",
+  #MAIL
+	 config.action_mailer.smtp_settings = {
+      :address              => "smtp.gmail.com",
+      :port                 => 587,
+      :domain               => "gmail.com",
+      :user_name            => "jacob.wimer@gmail.com",
+      :password             => ENV["WRESTLINGDEV_EMAIL_PWD"],
+      :authentication       => :plain,
+      :enable_starttls_auto => true
     }
-  config.action_mailer.perform_deliveries = true
+    config.action_mailer.perform_deliveries = true
     #Devise needs origin of email
-    config.action_mailer.default_url_options = { :host => 'wrestlingdev.com' }
+    Rails.application.routes.default_url_options[:host] = 'wrestlingdev.com'
 end