Merge pull request #8 from amaozhao/master

提交friends app
Merge pull request #1 from mutoulbj/branch1

Merge pull request #8 from amaozhao/master