words
Merge branch 'Tom' into mike

Conflicts:
	FlightNode.h
	a.out
stuff
Merge branch 'master' into mike

Conflicts:
	FlightNode.h
	a.out
Merge branch 'mike' of https://github.com/tkajder/AirportReservation into mike

Conflicts:
	a.out
stuff
Merge branch 'Seth' of https://github.com/tkajder/AirportReservation into Seth

Conflicts:
	a.out
Merge branch 'Seth' of https://github.com/tkajder/AirportReservation into Seth

Conflicts:
	a.out
	airport.cpp
Merge branch 'Seth' into mike
test
Merge branch 'Tom' into mike

Conflicts:
	a.out
moved printItinerary to user
Merge remote-tracking branch 'origin/mike' into Tom

Conflicts:
	a.out
Removed debugging cout.