Hw3

Merge hw3 into master.