Class Vehicle with attribute image
merge
fix
Merge branch 'master' of https://github.com/barta3/TravelPlanner.git

Conflicts:
	src/model/Vehicle.java
	src/view/SimulationEditorView.java