hw3-1 done
Merge branch 'hw3'