hw4 initial
Merge github.com:bweintra/HW4