Merge branch 'clean'

Conflicts:
	app/controllers/tournaments_controller.rb

1 files changed, 8 insertions, 0 deletions

diff --git a/db/migrate/20140307022759_create_match_team_join_table.rb b/db/migrate/20140307022759_create_match_team_join_table.rb
new file mode 100644
index 0000000..c2ed1b7
--- /dev/null
+++ b/db/migrate/20140307022759_create_match_team_join_table.rb
@@ -0,0 +1,8 @@
+class CreateMatchTeamJoinTable < ActiveRecord::Migration
+  def change
+    create_join_table :matches, :teams do |t|
+      # t.index [:match_id, :team_id]
+      # t.index [:team_id, :match_id]
+    end
+  end
+end