assignment 4
Merge https://github.com/lw1582/assignment4
Merge pull request #18 from lw1582/master

assignment4