resolvendo conflitos
repassando
Merge branch 'master' of github.com:ZiruZanrgeiff/Batman