Resolution of Curve and Surface Singularities in Characteristic Zero