Bugfix/proximal map fix
Created by: dyang37
Performed sames tests specified in last Friday's slides using this branch, and got same results.
Created by: dyang37
Performed sames tests specified in last Friday's slides using this branch, and got same results.