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

diff --git a/db/migrate/20140422061628_create_servers.rb b/db/migrate/20140422061628_create_servers.rb
new file mode 100644
index 0000000..fbe1b02
--- /dev/null
+++ b/db/migrate/20140422061628_create_servers.rb
@@ -0,0 +1,9 @@
+class CreateServers < ActiveRecord::Migration
+  def change
+    create_table :servers do |t|
+      t.integer :default_user_permissions
+
+      t.timestamps
+    end
+  end
+end