temp
Merge branch 'master' of https://github.com/kevinzang/fitplan_diet_calculator
no important changes here