Fixing conflicts.
mensagens de teste
Merge remote-tracking branch 'origin/master'