lucy wang assignment 3
Merge pull request #15 from lw1582/master

lucy wang assignment 3