assd
contraste, brillo
Merge branches 'master' and 'dani'