condicoes adicionadas
Merge branch 'master' of https://github.com/caiotaniguchi/mapa