created conjGrad_2D

applyAdjointK and applyK don't take in masks now.