Added proposta 2
Merge branch 'parte2' of https://github.com/quartz55/aeda-projeto1 into parte2