Quasi-crystals and amorphous materials