Merge branch 'clean2'

Conflicts:
	start.sh

1 files changed, 11 insertions, 0 deletions

diff --git a/db/migrate/20140421135721_create_brackets.rb b/db/migrate/20140421135721_create_brackets.rb
new file mode 100644
index 0000000..8813bf2
--- /dev/null
+++ b/db/migrate/20140421135721_create_brackets.rb
@@ -0,0 +1,11 @@
+class CreateBrackets < ActiveRecord::Migration
+  def change
+    create_table :brackets do |t|
+      t.references :user, index: true
+      t.references :tournament, index: true
+      t.string :name
+
+      t.timestamps
+    end
+  end
+end