third commit, testing marker placement and removal
Merge branch 'master' of https://github.com/mattman93/onCampus2
third commit, testing marker placement and removal