Merge pull request #7 from DennyWest/wk04homework

asdf