Adding header to try to avoid mixing up results
Fixing Protein Discount
Adding Molasses and Magnesium
Merge branch 'master' into cooking

Conflicts:
	src/main/scala/com/github/rcmurphy/dietmodel/Model.scala