Merge pull request #18 from maiahariton/master

merge conflict on the horizon
Merge pull request #19 from maiahariton/master

maps and markers work
fixing merge conflicts
handling merge conflicts
Merge pull request #20 from maiahariton/master

almost done
everything works
it works