update
Merge branch 'master' of https://www.github.com/gitzq/shopping