Calorie class - now comparable to weights

Calorie overwrites old data, selectable dates, dates look good. Now to
attach points to calories.