Merge branch 'clean2'

Conflicts:
	app/controllers/tournaments_controller.rb
	app/models/match.rb
	app/views/matches/index.html.erb
	app/views/matches/show.html.erb
	app/views/tournaments/index.html.erb
	app/views/tournaments/show.html.erb

1 files changed, 12 insertions, 0 deletions

diff --git a/db/migrate/20140422061706_create_statistics.rb b/db/migrate/20140422061706_create_statistics.rb
new file mode 100644
index 0000000..cc2e97d
--- /dev/null
+++ b/db/migrate/20140422061706_create_statistics.rb
@@ -0,0 +1,12 @@
+class CreateStatistics < ActiveRecord::Migration
+  def change
+    create_table :statistics do |t|
+      t.references :user, index: true
+      t.references :match, index: true
+      t.string :name
+      t.integer :value
+
+      t.timestamps
+    end
+  end
+end