Merge pull request #2 from Cdevenish/master

Merge to web
Merge pull request #3 from Cdevenish/gh-pages

Merge pull request #2 from Cdevenish/master