muitas alteracoes.
Merge branch 'master' of https://github.com/daniloegea/trabalho_so