squashed commits and added hw4 files

Ok, pretty sure I successfully squashed all of my commits into one for hw4.