Resolucao de conflitos de commit
Merge branch 'master' of https://github.com/matheusgg/rugrat.git