finish fewest hops
Merge branch 'dev' into conor
Fixed conflicts between Flight.cpp Flight.h graph.cpp graph.h