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, 11 insertions, 0 deletions

diff --git a/db/migrate/20140307004027_create_scores.rb b/db/migrate/20140307004027_create_scores.rb
new file mode 100644
index 0000000..4ca0b0b
--- /dev/null
+++ b/db/migrate/20140307004027_create_scores.rb
@@ -0,0 +1,11 @@
+class CreateScores < ActiveRecord::Migration
+  def change
+    create_table :scores do |t|
+      t.references :user, index: true
+      t.references :match, index: true
+      t.integer :value
+
+      t.timestamps
+    end
+  end
+end