james' commit
sample
Merge branch 'master' of https://github.com/ekyauk/StanfordRides