complete homework assignment
Merge branch 'master' of https://github.com/katiekatieb/portfolio into katie
Merge pull request #1 from katiekatieb/katie

Katie