Merge branch 'clean'

Conflicts:
	app/controllers/users_controller.rb
	app/views/users/show.json.jbuilder
	db/migrate/20140306014123_add_index_to_users_email.rb
	db/migrate/20140306014125_add_index_to_users_user_name.rb
	db/migrate/20140306014128_add_password_digest_to_users.rb
	db/migrate/20140306014130_add_remember_token_to_users.rb
	db/schema.rb

1 files changed, 11 insertions, 0 deletions

diff --git a/db/migrate/20140306022647_create_game_attributes.rb b/db/migrate/20140306022647_create_game_attributes.rb
new file mode 100644
index 0000000..b63f134
--- /dev/null
+++ b/db/migrate/20140306022647_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