Merge branch 'clean2'

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

1 files changed, 15 insertions, 0 deletions

diff --git a/db/migrate/20140427001454_create_game_settings.rb b/db/migrate/20140427001454_create_game_settings.rb
new file mode 100644
index 0000000..06fb72e
--- /dev/null
+++ b/db/migrate/20140427001454_create_game_settings.rb
@@ -0,0 +1,15 @@
+class CreateGameSettings < ActiveRecord::Migration
+  def change
+    create_table :game_settings do |t|
+      t.references :game, index: true
+      t.string :name
+      t.integer :vartype
+      t.text :type_opt
+      t.text :description
+      t.integer :display_order
+      t.text :default
+
+      t.timestamps
+    end
+  end
+end