Merge pull request #1 from natechols/master

update test pages from master
Merge pull request #2 from natechols/master

Merge with master
Merge pull request #3 from natechols/gh-pages

merge master