fixes conflicts with poll branch

db/migrate/20160914110004_create_polls.rb

@@ -0,0 +1,7 @@
+class CreatePolls < ActiveRecord::Migration
+  def change
+    create_table :polls do |t|
+      t.string :name
+    end
+  end
+end

db/migrate/20160914110039_create_poll_officers.rb

@@ -0,0 +1,7 @@
+class CreatePollOfficers < ActiveRecord::Migration
+  def change
+    create_table :poll_officers do |t|
+      t.integer :user_id
+    end
+  end
+end

db/schema.rb

@@ -281,6 +281,10 @@ ActiveRecord::Schema.define(version: 20160914172535) do
     t.string  "document_type"
   end
 
+  create_table "poll_officers", force: :cascade do |t|
+    t.integer "user_id"
+  end
+
   create_table "polls", force: :cascade do |t|
     t.string "name"
   end