Merge pull request #2 from iomahony/master

merge
CNAME
Merge pull request #3 from iomahony/gh-pages

merging