hw2 - final commit

I kept screwing up my commits. Here's the real thing.