initial fleeteditor
conflict masterGUI resolved
Merge branch 'master' of https://github.com/barta3/TravelPlanner.git

Conflicts:
	src/view/MasterGui.java