geolocation part 2
fixing conflicts
Merge pull request #37 from ljdegastines/geolocation-2nd-part

geolocation part 2
fixing merge errors