Merge branch 'clean'

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

1 files changed, 11 insertions, 0 deletions

diff --git a/db/migrate/20140306014108_create_game_attributes.rb b/db/migrate/20140306014108_create_game_attributes.rb
new file mode 100644
index 0000000..b63f134
--- /dev/null
+++ b/db/migrate/20140306014108_create_game_attributes.rb
@@ -0,0 +1,11 @@
+class CreateGameAttributes < ActiveRecord::Migration
+  def change
+    create_table :game_attributes do |t|
+      t.references :game, index: true
+      t.text :key
+      t.integer :type
+
+      t.timestamps
+    end
+  end
+end