commit hw4
Merge pull request #17 from ariesyi329/master

commit hw4