hw #3
Merge pull request #40 from nicoleyimessier/master

hw #3