resolvendo conflito
Merge branch 'major-model-change' of https://github.com/rfeijolo/infnetavaliacoes into major-model-change