Merge pull request #2 from Hyphen-ated/master

update pages with master