Merge remote-tracking branch 'origin/master'

Conflicts:
	CNAME

Revert "Deleted CNAME"

This reverts commit
e55c29b8b920c120f9946aabc2923485a24ae79f.