Merge branch 'Entrega1' into Eliane-Margarida-S.-O.-Ramos
Merge pull request #2 from ElianeMargarida/Eliane-Margarida-S.-O.-Ramos

Merge branch 'Entrega1' into Eliane-Margarida-S.-O.-Ramos