trap bus erased
Merge branch 'master' of https://github.com/kuuubrak/PublicTransportSimulator

Conflicts:
	src/main/SimulatorConstants.java