Commit
Update _config.yml
Create CNAME
Delete CNAME
Merge remote-tracking branch 'origin/gh-pages'
Merge branch 'master' into gh-pages

Conflicts:
	_config.yml