Gromov-Hausdorff and Intrinsic Flat Convergence