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

Conflicts:
	app/assets/stylesheets/scaffolds.css.scss
	app/views/layouts/application.html.erb
	db/migrate/20140304043618_create_servers.rb
	db/migrate/20140304043622_create_matches.rb
	db/migrate/20140304043631_create_games.rb

1 files changed, 10 insertions, 0 deletions

diff --git a/db/migrate/20140304043622_create_matches.rb b/db/migrate/20140304043622_create_matches.rb
new file mode 100644
index 0000000..325863d
--- /dev/null
+++ b/db/migrate/20140304043622_create_matches.rb
@@ -0,0 +1,10 @@
+class CreateMatches < ActiveRecord::Migration
+  def change
+    create_table :matches do |t|
+      t.references :tournament, index: true
+      t.string :name
+
+      t.timestamps
+    end
+  end
+end