Preliminary getReservations
Merge branch 'master' of https://github.com/tkajder/AirportReservation into Tom
Decided on object setup.
Merge branch 'master' into mike

Conflicts:
	Reservation.h
	User.h
trying to fix git