Merge branch 'master' of https://github.com/LukeShu/leaguer

Conflicts:
	app/assets/stylesheets/matches.css.scss

1 files changed, 13 insertions, 0 deletions

diff --git a/db/migrate/20140406235940_create_matches.rb b/db/migrate/20140406235940_create_matches.rb
new file mode 100644
index 0000000..31eea12
--- /dev/null
+++ b/db/migrate/20140406235940_create_matches.rb
@@ -0,0 +1,13 @@
+class CreateMatches < ActiveRecord::Migration
+  def change
+    create_table :matches do |t|
+      t.integer :status
+      t.references :tournament, index: true
+      t.string :name
+      t.references :winner, index: true
+      t.string :remote_id
+
+      t.timestamps
+    end
+  end
+end