implemented rest
Merge branch 'master' of https://github.com/kvothe/GeoTracker.git