Merge branch 'clean'

Conflicts:
	app/controllers/sessions_controller.rb
	app/views/sessions/new.html.erb
	config/routes.rb

1 files changed, 13 insertions, 0 deletions

diff --git a/db/migrate/20140306014101_create_games.rb b/db/migrate/20140306014101_create_games.rb
new file mode 100644
index 0000000..59d4ef0
--- /dev/null
+++ b/db/migrate/20140306014101_create_games.rb
@@ -0,0 +1,13 @@
+class CreateGames < ActiveRecord::Migration
+  def change
+    create_table :games do |t|
+      t.text :name
+      t.integer :players_per_team
+      t.integer :teams_per_match
+      t.integer :set_rounds
+      t.integer :randomized_teams
+
+      t.timestamps
+    end
+  end
+end