calculations and about
Merge branch 'master' of github.com:jamesfzhang/food