Mapa funcionando
Arreglando errores de Franco GATO
Arreglando
Merge branch 'master' of https://github.com/paslo22/hack

Conflicts:
	hack/static/css/main.css
	hack/static/js/main.js
Merge branch 'master' of https://github.com/paslo22/hack

Conflicts:
	hack/static/css/main.css