solo falta corregir ortografia de halftone y wave
Merge branch 'master' of https://github.com/LeandroLovisolo/Orga2-TP2