Merge pull request #1 from katherinesandoval/master

all together
Merge pull request #2 from katherinesandoval/master

this week's code
Merge pull request #3 from katherinesandoval/gh-pages

all together