new
Merge https://github.com/nickfreeman/LocationTracker
new