mac
Merge branch 'master' of https://github.com/softcodedotca/DineSafePy

Conflicts:
	add_geo_markers_to_dinesafe.py
Merge branch 'master' of https://github.com/softcodedotca/DineSafePy
merge