hw13 changes
Merge pull request #14 from westjour/master

Hw13