Classe conflito
Merge branch 'development' of https://github.com/paulohtfs/DojoGit into development