bill.json is a mess
Merge remote-tracking branch 'origin/master'