First commit
second commit
Merge pull request #11 from fs1214/master

assignment6 from Fangyun Sun