Conflicts: app/controllers/organizations_controller.rb app/helpers/organizations_helper.rb db/schema.rb public/images/homepage_icon.png public/stylesheets/new_user.css