bistro bohem
Merge branch 'master' of https://github.com/mikelmaron/dc-wifi-social into bistro-bohem

Conflicts:
	bars.geojson