fixed stuff
Initial debugs of reservations.
Merge remote-tracking branch 'origin/mike' into Tom

Conflicts:
	FlightNode.h
	a.out
Not shit.