this week's code
Merge pull request #2 from katherinesandoval/master

this week's code