add shopping
Update README.md
final
Merge pull request #1 from yanyankangkang/dev

add shopping
sovle confilct
Merge branch 'jessyli-master'
Merge pull request #1 from yanyankangkang/master

permission to modify files