map knows your location
Merge branch 'dev' of https://github.com/samdec11/somethingborrowed into dev