working on a discover menu
Merge branch 'master' of github.com:itsabeautifulday/project-triangle
marker for current location
merge