Conflicts: app/controllers/organizations_controller.rb db/schema.rb public/stylesheets/courses.css public/stylesheets/public.css