Conflicts: app/controllers/organizations_controller.rb config/routes.rb db/schema.rb public/images/hwork_icon.png public/stylesheets/new_user.css public/stylesheets/public.css