Merge branch 'clean2'

Conflicts:
	app/controllers/tournaments_controller.rb
	app/views/tournaments/_form.html.erb
	app/views/tournaments/index.html.erb
	app/views/tournaments/show.html.erb

1 files changed, 13 insertions, 0 deletions

diff --git a/db/migrate/20140428132900_create_matches.rb b/db/migrate/20140428132900_create_matches.rb
new file mode 100644
index 0000000..bac92d1
--- /dev/null
+++ b/db/migrate/20140428132900_create_matches.rb
@@ -0,0 +1,13 @@
+class CreateMatches < ActiveRecord::Migration
+  def change
+    create_table :matches do |t|
+      t.integer :status
+      t.references :tournament_stage, index: true
+      t.references :winner, index: true
+      t.text :remote_id
+      t.integer :submitted_peer_evaluations
+
+      t.timestamps
+    end
+  end
+end