configurations
merging
added bus stops page
Merge branch 'master' of https://github.com/kathrynsiegel/busme

* 'master' of https://github.com/kathrynsiegel/busme:
  lol css