committing before pulling friend stuff
Fixed merge conflicts, added request from
Merge branch 'master' of https://github.com/kevinzang/fitplan_diet_calculator