Merge branch 'clean2'

Conflicts:
	app/controllers/alerts_controller.rb
	app/controllers/application_controller.rb
	app/controllers/matches_controller.rb
	app/controllers/servers_controller.rb
	app/controllers/sessions_controller.rb
	app/controllers/tournaments_controller.rb
	app/controllers/users_controller.rb
	app/models/match.rb
	app/models/team.rb
	app/models/tournament.rb
	app/views/sessions/_form.html.erb
	app/views/sessions/index.html.erb
	app/views/sessions/index.json.jbuilder
	app/views/sessions/show.html.erb
	app/views/sessions/show.json.jbuilder
	app/views/tournaments/index.html.erb
	config/routes.rb
	generate.sh

1 files changed, 13 insertions, 0 deletions

diff --git a/db/migrate/20140403155008_create_matches.rb b/db/migrate/20140403155008_create_matches.rb
new file mode 100644
index 0000000..31eea12
--- /dev/null
+++ b/db/migrate/20140403155008_create_matches.rb
@@ -0,0 +1,13 @@
+class CreateMatches < ActiveRecord::Migration
+  def change
+    create_table :matches do |t|
+      t.integer :status
+      t.references :tournament, index: true
+      t.string :name
+      t.references :winner, index: true
+      t.string :remote_id
+
+      t.timestamps
+    end
+  end
+end