merge conflict resolved

src/main/java/hs/fulda/de/ci/exam/project/Itinerary.java

@@ -0,0 +1,10 @@
+package hs.fulda.de.ci.exam.project;
+
+import java.util.ArrayList;
+
+public class Itinerary {
+
+    public Itinerary(Airport start_airport, Airport final_airport) {
+
+    }
+}