Minor tweaks
Local changes
Merge branch 'master' of github.com:mrvdot/hackForCO

Conflicts:
	web/index.html
	web/maps.js
More maps shit
Merge branch 'master' of github.com:mrvdot/hackForCO