Macaroni and Potato Soup