tag task1
Merge pull request #4 from jinxuan/master

tag task1