resolvendo conflitos
Merge branch 'master' of https://github.com/Fabio-CS/playground.git
consertando detalhes pagina gastronomia_detalhes