resolvendo conflitos
Merge branch 'master' of https://github.com/pedromarcelojava/esfinge.git