Most of the searches are working properly, but some still have issues.

Need to get group to look at my code and try to figure out how to solve.

Also need to take my code out of main and put it into its own class.

Files Modified: Stub.java and FlightScreen.java
Merge branch 'master' of git@github.com:COMP-3350-Group-6/Project.git

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