Resolution of Curve and Surface Singularities in