Fixed an oversight: hadn't added class Bus to the file
Trying to get out of the conflict I'm stuck in because two of us tried to add class Bus at the same time.

Merge branch 'master' of https://github.com/rebeccaj/SFMTASimulation

Conflicts:
	SFMTASimulation.java