Pegando planta
Merge branch 'master' of https://github.com/caiotaniguchi/mapa

Conflicts:
	DAO/andarDAO.php