From fb76b4db64583def6db3aac43e31c25d3bd489df Mon Sep 17 00:00:00 2001
From: DavisLWebb <davislwebb@ymail.com>
Date: Tue, 4 Mar 2014 16:22:22 -0500
Subject: Git is telling me to commit I dont know why

---
 app/assets/stylesheets/scaffolds.css.scss | 22 +---------------------
 app/models/game.rb                        |  1 -
 app/views/games/index.html.erb            |  4 ++--
 3 files changed, 3 insertions(+), 24 deletions(-)

(limited to 'app')

diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss
index 8279f4f..6ec6a8f 100644
--- a/app/assets/stylesheets/scaffolds.css.scss
+++ b/app/assets/stylesheets/scaffolds.css.scss
@@ -1,13 +1,9 @@
 body {
-  background-color: #EEEEEE;
+  background-color: #fff;
   color: #333;
   font-family: verdana, arial, helvetica, sans-serif;
   font-size: 13px;
   line-height: 18px;
-
-  h1, h2, h3, h4, h5{
-    color: #0f0f0f;
-  }
 }
 
 p, ol, ul, td {
@@ -71,19 +67,3 @@ div {
     list-style: square;
   }
 }
-
-hr {
-  -moz-border-bottom-colors: none;
-  -moz-border-image: none;
-  -moz-border-left-colors: none;
-  -moz-border-right-colors: none;
-  -moz-border-top-colors: none;
-  border-color: #999 -moz-use-text-color #FFFFFF;
-  border-style: solid none;
-  border-width: 1px 0;
-  margin: 18px 0;
-}
-
-#footer{
-  text-align: center;
-}
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/views/games/index.html.erb b/app/views/games/index.html.erb
index 2c178f5..ccd0f63 100644
--- a/app/views/games/index.html.erb
+++ b/app/views/games/index.html.erb
@@ -1,6 +1,6 @@
 <h1>Listing games</h1>
 
-<table class="table table-hover">
+<table>
   <thead>
     <tr>
       <th>Name</th>
@@ -32,4 +32,4 @@
 
 <br>
 
-<%= link_to 'New Game', new_game_path, {:class => "btn btn-warning"} %> 
+<%= link_to 'New Game', new_game_path %>
-- 
cgit v1.2.3-2-g168b


From 6d48e4641520ce03796e5b9edd258f704cee3e82 Mon Sep 17 00:00:00 2001
From: DavisLWebb <davislwebb@ymail.com>
Date: Tue, 4 Mar 2014 17:46:05 -0500
Subject: Changed some username validation stuff

---
 app/assets/stylesheets/scaffolds.css.scss | 7 -------
 app/models/user.rb                        | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

(limited to 'app')

diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss
index 566d05d..f705417 100644
--- a/app/assets/stylesheets/scaffolds.css.scss
+++ b/app/assets/stylesheets/scaffolds.css.scss
@@ -4,13 +4,10 @@ body {
   font-family: verdana, arial, helvetica, sans-serif;
   font-size: 13px;
   line-height: 18px;
-<<<<<<< HEAD
-=======
 }
 
 h1, h2, h3, h4, h5{
   color: #0f0f0f;
->>>>>>> aca85cf084702c29014a17eafb090421061fae8b
 }
 
 p, ol, ul, td {
@@ -74,9 +71,6 @@ div {
     list-style: square;
   }
 }
-<<<<<<< HEAD
-=======
-
 hr {
   -moz-border-bottom-colors: none;
   -moz-border-image: none;
@@ -102,4 +96,3 @@ hr {
 #footer{
   text-align: center;
 }
->>>>>>> aca85cf084702c29014a17eafb090421061fae8b
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
-- 
cgit v1.2.3-2-g168b