attempted to use carbohydrate rather than energy data for macronutrients, commented out
fats and cholesterol
Merge branch 'master' into gh-pages