Rigid and Non-rigid Motion Artifact Reduction in X-ray CT