adding Weights in prox
fixing the merging problems
Merge branch 'grad' into fig_prox
Merge branch 'fig_prox' into grad