Added weekly meal goal
rebasing from master