Fixed merge conflicts

db/migrate/20140716001857_add_confirmation_token_to_conference_registrations.rb

@@ -0,0 +1,5 @@
+class AddConfirmationTokenToConferenceRegistrations < ActiveRecord::Migration
+  def change
+    add_column :conference_registrations, :confirmation_token, :string
+  end
+end

db/migrate/20140716002152_add_data_to_conference_registrations.rb

@@ -0,0 +1,5 @@
+class AddDataToConferenceRegistrations < ActiveRecord::Migration
+  def change
+    add_column :conference_registrations, :data, :binary
+  end
+end