"adding markers to map"
added jquery
updating changes for merge
Merge remote-tracking branch 'upstream/master'
attempting to merge changes of jquery