Temp commit
Commit for pulling
RideOffers (and RideRequests?) can now be cancelled
Merge commit and RideOffers can stil be deleted.
Merge branch 'master' of https://github.com/llovett/obietaxi