Merge pull request #1 from luciojp/clenimar

Mudanças:
Merge branch 'nicolas' of https://github.com/luciojp/LaboratorioLP2Projeto into nicolas
Merge pull request #3 from luciojp/nicolas

Nicolas