trying to fix git
changed things
Merge branch 'mike'

Conflicts:
	FlightPath.h
	ReservationList.h
	User.h
Merging Mike and Tom
debugging