merge hw4

merge hw4