updating
Merge pull request #9 from katherinesandoval/gh-pages

Merge pull request #8 from katherinesandoval/master
Merge pull request #10 from katherinesandoval/master

all together