Merge pull request #1 from jtcond13/master

Master
Update CNAME
Merge pull request #2 from jtcond13/gh-pages

Merge