Merge branch 'clean'

Conflicts:
	app/controllers/users_controller.rb
	app/views/users/index.html.erb

1 files changed, 10 insertions, 0 deletions

diff --git a/db/migrate/20140306024711_create_matches.rb b/db/migrate/20140306024711_create_matches.rb
new file mode 100644
index 0000000..325863d
--- /dev/null
+++ b/db/migrate/20140306024711_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