.
Resolvendo conflitos.
.
Merge branch 'master' of github.com:isaiasalfe/levaeuApp