Merge branch 'Tom' of https://github.com/tkajder/AirportReservation into Seth

Conflicts:
	a.out
Merge remote-tracking branch 'origin/mike' into Seth

Conflicts:
	a.out
Moved bags to reservation
fixed typo
sdlfkja
Merge remote-tracking branch 'origin/mike' into Seth

Conflicts:
	airport.cpp
Merge remote-tracking branch 'origin/Seth' into Tom

Conflicts:
	a.out