first commit
Merge pull request #14 from fs1214/master

assignment11 from Fangyun Sun