fixing conflicts [#9]

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/migrate/20150718075238_acts_as_taggable_on_migration.acts_as_taggable_on_engine.rb

@@ -0,0 +1,25 @@
+# This migration comes from acts_as_taggable_on_engine (originally 1)
+class ActsAsTaggableOnMigration < ActiveRecord::Migration
+  def self.up
+    create_table :tags do |t|
+      t.string :name
+    end
+
+    create_table :taggings do |t|
+      t.references :tag
+      t.references :taggable, polymorphic: true
+      t.references :tagger, polymorphic: true
+      t.string :context, limit: 128
+      t.datetime :created_at
+    end
+
+    add_index :tags, :name, unique: true
+    add_index :taggings, :tag_id
+    add_index :taggings, [:taggable_id, :taggable_type, :context]
+  end
+
+  def self.down
+    drop_table :taggings
+    drop_table :tags
+  end
+end

db/migrate/20150718075337_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb

@@ -0,0 +1,10 @@
+# This migration comes from acts_as_taggable_on_engine (originally 3)
+class AddTaggingsCounterCacheToTags < ActiveRecord::Migration
+  def self.up
+    add_column :tags, :taggings_count, :integer, default: 0
+  end
+
+  def self.down
+    remove_column :tags, :taggings_count
+  end
+end