CVaR figures
Merge branch 'Tuesbranch'
Merge branch 'Tuesbranch'