Improvements to displaying bus timetables
Conflicts!

Conflicts:
	src/ip7/bathuniapp/BusRoute.java