hw4_wujiarong
Merge pull request #2 from wujr5/master

hw4_wujiarong