apparently Gemfile.lock is ediited
Merge branch 'master' of https://github.com/kevinzang/fitplan_diet_calculator
Iteration 2
save
update to controller.progress, fix minor merge conflict