Merge pull request #3 from jinxuan/master

Jinxuanw's first commit
Merge pull request #4 from jinxuan/master

tag task1
Merge pull request #1 from akun1012/master

Pull request