homework 3 first commit
Merge pull request #31 from yx887/master

homework 3 yx887