Added a few macros, macros now doesnt require units in grams
few bugs dealing with quantity.  still making changes to analyze_food