Made changes!
Merge branch 'master' of https://github.com/OscarFalcon/Airport_FX.git
Merge branch 'master' of https://github.com/OscarFalcon/Airport_FX.git
changed unimplemented methods
fixed unimplemented methods
Merge branch 'master' of https://github.com/OscarFalcon/Airport_FX.git

Conflicts:
	src/application/MyTripController.java