assignment 4
Merge https://github.com/lw1582/assignment4