Archived
Conflicts: app/controllers/application_controller.rb app/controllers/confirmations_controller.rb
Conflicts: app/controllers/application_controller.rb app/controllers/confirmations_controller.rb