first attempt
gps locater
Merge branch 'master' into HEAD