Merge branch 'jay-chen'
dp
Merge branch 'jay-chen'
dp
finished friend list and search user list
Merge branch 'master' of github.com:jack08300/personalShopper
Merge branch 'master' into jay-chen