Merge branch 'clean'

Conflicts:
	app/models/match.rb
	app/views/matches/index.html.erb
	app/views/matches/show.html.erb

1 files changed, 3 insertions, 1 deletions

diff --git a/db/schema.rb b/db/schema.rb
index c9c0fa6..55f4046 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140307050124) do
+ActiveRecord::Schema.define(version: 20140307052443) do
 
   create_table "alerts", force: true do |t|
     t.integer  "author_id"
@@ -50,11 +50,13 @@ ActiveRecord::Schema.define(version: 20140307050124) do
   create_table "matches", force: true do |t|
     t.integer  "tournament_id"
     t.string   "name"
+    t.integer  "winner_id"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   add_index "matches", ["tournament_id"], name: "index_matches_on_tournament_id"
+  add_index "matches", ["winner_id"], name: "index_matches_on_winner_id"
 
   create_table "matches_teams", id: false, force: true do |t|
     t.integer "match_id", null: false