Macaroni and Potato Salad