Merge hw3

merge hw3