Rename utility_d to utility_discounted
Merge remote-tracking branch 'origin/develop' into develop
Back to original consumption_discount equation