THIS BETTER BE THE LAST TIME iM UPDATING CNAME.
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

* origin/gh-pages:
  adding favicon