assignment 10 from Fangyun Sun
Merge pull request #16 from fs1214/master

assignment 10 from Fangyun Sun