Merge pull request #15 from marissablock23/master

update
Merge pull request #16 from marissablock23/gh-pages

Merge pull request #15 from marissablock23/master