fixed bug in bodyfat application
Merge branch 'CleanCode' of https://github.com/zmchary/Estimation_With_Two_Steps into CleanCode

fixed bug in bodyfat at dahai
-a
creat a merge conflict
Merge branch 'CleanCode' of https://github.com/zmchary/Estimation_With_Two_Steps into CleanCode
Merge branch 'CleanCode' of github.com:zmchary/Estimation_With_Two_Steps into CleanCode
creat a conflict
test merge conflict
Merge branch 'CleanCode'