Merge pull request #14 from DennyWest/wk04homework

Wk04homework
Merge pull request #15 from DennyWest/master

Merge pull request #13 from DennyWest/wk04homework
Merge pull request #16 from DennyWest/revert-4-master

asdf