showing (food, weight) nutrition values
Merge remote-tracking branch 'origin/master'
Checkpoint 4/13/14
showing (food, weight) nutrition values
Merge pull request #8 from piaw/master

Merge pull request #3 from xiaoqin2012/master
Merge pull request #4 from xiaoqin2012/master

merge from xiaoqin