closer to the edge
Merge branch 'after_delivery_date' of https://github.com/Lucas-Andrade/Grupo-3-EHL into after_delivery_date

Conflicts:
	bin/airtrafficcontrol/app/menuoptions/AddAListOfFlightsOption.class
	bin/airtrafficcontrol/app/menuoptions/ConsultFlightDetailsOption.class
	bin/airtrafficcontrol/app/menuoptions/UpdateDatabaseOption.class
	bin/airtrafficcontrol/app/tests/AirshipTest_UsingAirlinerInstance.class
	bin/airtrafficcontrol/app/tests/AirshipTest_UsingTransportInstance.class
	bin/airtrafficcontrol/app/utils/Airship.class
	bin/airtrafficcontrol/app/utils/FlightPlan.class
	src/airtrafficcontrol/app/utils/Airship.java
working