DIANA'S MACARONI SALAD