Merge pull request #13 from DennyWest/wk04homework

Merge pull request #12 from DennyWest/master