Hw3

hw3 merge request