short-tag passada para versão longa
Merge branch 'master' of https://github.com/Albertoni/Planeta-Rooda-2
merge padrao