HW3 changes
Merge pull request #2 from jkteuber/hw3

HW3 changes