assignment3 from Fangyun Sun
Merge pull request #17 from fs1214/master

assignment3 from Fangyun Sun