Added amt/cal to nutrient page
Some added data
Merge branch 'master' of git://github.com/robnormal/nodam-example-diet