Merge pull request #19 from Uepsilon/calories

calories for products
Merge branch 'master' into statistics