Merge pull request #17 from piaw/master

merge with xiaoqin
Merge pull request #18 from piaw/master

add missing file ShoppingEntry.java
showing (food, weight) nutrition values
Merge pull request #8 from xiaoqin2012/master

merge with xiaoqin