Merge branch 'clean'

Conflicts:
	app/controllers/tournaments_controller.rb
	app/views/teams/show.html.erb
	app/views/tournaments/index.html.erb
	config/routes.rb

1 files changed, 16 insertions, 0 deletions

diff --git a/db/migrate/20140307003719_create_tournaments.rb b/db/migrate/20140307003719_create_tournaments.rb
new file mode 100644
index 0000000..545e603
--- /dev/null
+++ b/db/migrate/20140307003719_create_tournaments.rb
@@ -0,0 +1,16 @@
+class CreateTournaments < ActiveRecord::Migration
+  def change
+    create_table :tournaments do |t|
+      t.references :game, index: true
+      t.integer :status
+      t.integer :min_players_per_team
+      t.integer :max_players_per_team
+      t.integer :min_teams_per_match
+      t.integer :max_teams_per_match
+      t.integer :set_rounds
+      t.boolean :randomized_teams
+
+      t.timestamps
+    end
+  end
+end