assignment5 from Fangyun Sun
Merge pull request #10 from fs1214/master

assignment5 from Fangyun Sun