Added 2d prox TODO test
Made Class norm_tv
Added a comment
Merge branch 'prox' into grad