Merge pull request #139 from Continuities/master

bring gh-pages up to speed
Merge pull request #1 from dittoslash/gh-pages

Merged