both graphs now working
Merge branch 'debtcalc' into testing