sldkfj
This is old, don't use
Merge branch 'master' of https://github.com/tkajder/AirportReservation

Conflicts:
	airport.cpp
Merge branch 'master' into Seth

Conflicts:
	airport.cpp~
Merge branch 'master' of https://github.com/tkajder/AirportReservation
Merge branch 'master' into Seth
Merge branch 'master' of https://github.com/tkajder/AirportReservation
Merge branch 'master' into Seth
Merge branch 'master' of https://github.com/tkajder/AirportReservation
Merge branch 'master' into Seth
Merge branch 'master' of https://github.com/tkajder/AirportReservation
Merge branch 'master' into Seth
Merge branch 'master' of https://github.com/tkajder/AirportReservation
Merge branch 'master' into Seth
Changed the add minutes function.  Testing needed
Rid of that shit.
Merge remote-tracking branch 'origin/Seth'
New changes.
Merge remote-tracking branch 'origin/Seth'
Newest