Merge branch 'clean2'

Conflicts:
	app/controllers/matches_controller.rb
	app/views/matches/index.html.erb
	app/views/matches/show.html.erb

1 files changed, 12 insertions, 0 deletions

diff --git a/db/migrate/20140429074515_create_tournament_stages.rb b/db/migrate/20140429074515_create_tournament_stages.rb
new file mode 100644
index 0000000..6e52bf0
--- /dev/null
+++ b/db/migrate/20140429074515_create_tournament_stages.rb
@@ -0,0 +1,12 @@
+class CreateTournamentStages < ActiveRecord::Migration
+  def change
+    create_table :tournament_stages do |t|
+      t.references :tournament, index: true
+      t.text :structure
+      t.string :scheduling_method
+      t.string :seeding_method
+
+      t.timestamps
+    end
+  end
+end