hw3

first
Merge pull request #3 from lijj47/master

hw3-ljj