le agregue un +
Merge branch 'master' of https://github.com/G3rcar/Consultorio.git

Conflicts:
	municipios.php