cancel pick up implemented
Merge branch 'master' of https://github.com/arundecent/ComputerizedRideShare