Merge pull request #12 from DennyWest/master

Merge pull request #11 from DennyWest/wk04homework
Merge pull request #13 from DennyWest/wk04homework

Merge pull request #12 from DennyWest/master