Of the ice cream cones sold yesterday at Erin's Ice Cream Shop, 7/12 were chocolate and another 1/4 were vanilla. What fraction of the ice cream cones sold were either chocolate or vanilla?