CNAME ...
Merge branch 'master' of https://github.com/weirdblackmagic/weirdblackmagic.github.io

Conflicts:
	CNAME
CNAME ...