commit pre pull
Merge branch 'v1' of https://github.com/gcba/mapa-emprendedores into v1

Conflicts:
	js/init.js
arreglo el ultimo commit