Dia 2-3

Dia 2-3
dias 2-3

dias 2-3
Merged Mariana's and Ana's changes