fixing merge confilts

app/models/user.rb

@@ -33,7 +33,7 @@ class User
       "wchulley@gmail.com", "kimfuh@yahoo.com", "CJichi@yahoo.com",
       "madkisso@mit.edu", "bribak@msn.com", "asykley@verizon.net",
       "paulhaeberli@gmail.com","bondovatic@gmail.com", "dixon1e@yahoo.com"]
-    
+
     allowed_emails.each{|allowed| 
       if email.include?(allowed)
         return true
@@ -243,7 +243,9 @@ class User
     group(:name => "Acquaintances")
     group(:name => "Family")
     group(:name => "Nemeses")
-    group(:name => "Work")
+
+    group(:name => "Pivots")
+
   end
 
   def album_by_id( id )

config/thin.yml

@@ -7,7 +7,7 @@ max_conns: 1024
 require: []
 
 max_persistent_conns: 512
-environment: development 
+environment: production
 servers: 1
 daemonize: true
 #chdir: /usr/applications/localhash/current