Merge pull request #1 from sbaldwin24/gh-pages

update
Merge pull request #2 from sbaldwin24/master

Merge pull request #1 from sbaldwin24/gh-pages