Merge branch 'clean'

Conflicts:
	app/controllers/tournaments_controller.rb

1 files changed, 11 insertions, 0 deletions

diff --git a/db/migrate/20140307022734_create_game_options.rb b/db/migrate/20140307022734_create_game_options.rb
new file mode 100644
index 0000000..2f62ef7
--- /dev/null
+++ b/db/migrate/20140307022734_create_game_options.rb
@@ -0,0 +1,11 @@
+class CreateGameOptions < ActiveRecord::Migration
+  def change
+    create_table :game_options do |t|
+      t.integer :vartype
+      t.string :name
+      t.text :default
+
+      t.timestamps
+    end
+  end
+end