updating cname in hopes that it fixes the site
Merge branch 'master' into develop
Merge branch 'develop' into release/alpha

* develop:
  updating cname in hopes that it fixes the site
Merge branch 'release/alpha' into gh-pages

* release/alpha:
  updating cname in hopes that it fixes the site