Git is telling me to commit I dont know why

6 files changed, 3 insertions, 54 deletions

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 %>
diff --git a/db/migrate/20140220221228_create_servers.rb b/db/migrate/20140220221228_create_servers.rb
deleted file mode 100644
index f33241a..0000000
--- a/db/migrate/20140220221228_create_servers.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class CreateServers < ActiveRecord::Migration
-  def change
-    create_table :servers do |t|
-
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20140220221236_create_matches.rb b/db/migrate/20140220221236_create_matches.rb
deleted file mode 100644
index 6c0c157..0000000
--- a/db/migrate/20140220221236_create_matches.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class CreateMatches < ActiveRecord::Migration
-  def change
-    create_table :matches do |t|
-      t.references :tournament, index: true
-
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20140228014045_create_games.rb b/db/migrate/20140228014045_create_games.rb
deleted file mode 100644
index 59d4ef0..0000000
--- a/db/migrate/20140228014045_create_games.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class CreateGames < ActiveRecord::Migration
-  def change
-    create_table :games do |t|
-      t.text :name
-      t.integer :players_per_team
-      t.integer :teams_per_match
-      t.integer :set_rounds
-      t.integer :randomized_teams
-
-      t.timestamps
-    end
-  end
-end