Merge pull request #1 from CCrosbyweb/master

changes
Merge pull request #2 from CCrosbyweb/gh-pages

Merge pull request #1 from CCrosbyweb/master