Nada
Merge branch 'master' of https://github.com/xsoares/Leguas.git
Merge branch 'master' of https://github.com/xsoares/Leguas.git
Nada foi alterado
Conflito Resolvido