A quasi-crystal is the natural extension of the notion of a crystal to structures with quasi-periodic, rather than periodic, translational order. Two and three-dimensional quasi-crystals are here classified by their symmetry under rotation, and it is shown that many disallowed crystals symmetries are allowed quasi-crystal symmetries. The diffraction pattern of an ideal quasi-crystal is analytically computed, and it is shown that the recently observed electron-diffraction pattern of an Al-Mn alloy is closely related to that of an icosahedral quasi-crystal.