fixed 1300PM problem
Merge branch 'master' of https://github.com/RocHack/rocbuses-chrome