maps and markers work
Merge pull request #19 from maiahariton/master

maps and markers work