mergin' the wizard

Merge branch 'master' of https://github.com/LukeShu/leaguer

2 files changed, 1 insertions, 2 deletions

diff --git a/app/models/game.rb b/app/models/game.rb
index b3b6977..a181c26 100644
--- a/app/models/game.rb
+++ b/app/models/game.rb
@@ -1,3 +1,2 @@
 class Game < ActiveRecord::Base
-  has_many :game_attributes
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index 55ea60f..db65dc4 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,7 +1,7 @@
 class User < ActiveRecord::Base
 
 	before_save { self.email = email.downcase }
-	before_save { self.user_name = user_name.downcase }
+	before_save { self.user_name = user_name }
 
 	##
 	# Rails looks for the create_remember_token and runs the method