finished map and geolocation
merge
Merge branch 'master' of https://github.com/rit/LAplus