. . . . "Non-conforming uses in non-conforming buildings may only be expanded if the use is a single- or two-family use and the addition will comply with the new By-law, or if the expansion is to accommodate parking requirements." .