Hw4

merge hw4 to master