Merge pull request #16 from cts12/feature/simon

Tweak
the algorithm should be working but data set might be wrong
fixed conflict
changes viewport scale
Merge branch 'master' into feature/simon
Merge pull request #17 from cts12/feature/simon

Stop data
Merge branch 'master' into feature/simon
Bus stop name