aggregated nutritional informaiton now showing up in single recipe viewgit add --all
fixed merged conflict in recipe single view
ensured user could only add a recipe to day of week when logged in
refactored recipes index for readability
merged with nutrition info branch to reflect alllll nutrition changes, which had not yet been merged into master
set up db with sample quantities for nutrition infomration calculation, normalized in grams
morning commit
added placeholder text for unloaded ingredients
merging with updated master
Merge pull request #49 from tararoys/cjo_nutunits

Cjo nutunits