minor tweeking
Ensuring map loads the options and nearbyResults when the map loads
Draggable marker. Dragging marker updates clientLoc
added gitignore to sasscache
done trying to merge conflicts
fixed merge conflicts