temp
Merge branch 'final_demo' of https://github.com/IF048JAVA/SoftTour into final_demo

Conflicts:
	src/main/java/com/softserveinc/softtour/parsers/BusParser.java