Merge hw3 into master