Merge branch 'master' into gh-pages
Create CNAME
Changed API URL

The API was at hrtb.us, but now the bus finder is there, so the bus finder needs to point at the real API URL.
Merge remote-tracking branch 'upstream/master'