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

diff --git a/db/migrate/20140422061636_create_alerts.rb b/db/migrate/20140422061636_create_alerts.rb
new file mode 100644
index 0000000..68a8e10
--- /dev/null
+++ b/db/migrate/20140422061636_create_alerts.rb
@@ -0,0 +1,10 @@
+class CreateAlerts < ActiveRecord::Migration
+  def change
+    create_table :alerts do |t|
+      t.references :author, index: true
+      t.text :message
+
+      t.timestamps
+    end
+  end
+end