Initial workings on geo-location
Merge branch 'master' into feature/simon
Basic Geo Location
Merge pull request #1 from cts12/feature/simon

Initial Geo Location Workings