Merge branch 'clean2'

Conflicts:
	app/models/pm.rb
	app/views/pms/index.html.erb
	app/views/pms/show.html.erb

1 files changed, 8 insertions, 0 deletions

diff --git a/db/migrate/20140424230654_create_tournament_hosts_join_table.rb b/db/migrate/20140424230654_create_tournament_hosts_join_table.rb
new file mode 100644
index 0000000..7521d89
--- /dev/null
+++ b/db/migrate/20140424230654_create_tournament_hosts_join_table.rb
@@ -0,0 +1,8 @@
+class CreateTournamentHostsJoinTable < ActiveRecord::Migration
+  def change
+    create_join_table :hosts, :tournaments do |t|
+      # t.index [:host_id, :tournament_id]
+      # t.index [:tournament_id, :host_id]
+    end
+  end
+end