Hw3

Merge hw3 sol into master