deleted file conflict
fixed delete file issue
fixes to map
fixes to merging issues
switch map system to google maps
switch map system to google maps
need all addresses
have markers deleting on click
filtering is working, will have to refactor once we have something to filter
ignore ds_store file
ignore git ds_store file
fixed merging issues
merging issues fixed
changes button text
add markers for all businesses to map