CNAME minus www
Merge branch 'master' of https://github.com/robterrin/robterrin.github.io

Conflicts:
	CNAME