Merge branch 'master' of github.com:braican/ridetracker