Merge pull request #7 from xiaoqin2012/master

merge from xiaoqin
shopping list implementation
Merge pull request #17 from piaw/master

merge with xiaoqin