Merge branch 'gh-pages'
Merge branch 'master' of https://github.com/jescoto/transitFare1