Hw4

Merge hw4 into master