fixing conflicts [#7]

db/migrate/20150717164054_add_first_name_and_last_name_to_users.rb

@@ -0,0 +1,6 @@
+class AddFirstNameAndLastNameToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :first_name, :string
+    add_column :users, :last_name, :string
+  end
+end

db/schema.rb

@@ -51,6 +51,8 @@ ActiveRecord::Schema.define(version: 20150718091702) do
     t.string   "last_sign_in_ip"
     t.datetime "created_at",                          null: false
     t.datetime "updated_at",                          null: false
+    t.string   "first_name"
+    t.string   "last_name"
   end
 
   add_index "users", ["email"], name: "index_users_on_email", unique: true