Merge pull request #2 from Hyphen-ated/master

update pages with master
Merge pull request #3 from Hyphen-ated/gh-pages

Merge pull request #2 from Hyphen-ated/master