updated GUI
Merge branch 'master' of git@github.com:COMP-3350-Group-6/Project.git

Conflicts:
	AirlineReservationSystem/src/presentation/FlightScreen.java
	AirlineReservationSystem/src/presentation/MenuScreen.java
	AirlineReservationSystem/src/presentation/WelcomeScreenGUI.java
Merge branch 'master' of git@github.com:COMP-3350-Group-6/Project.git