fix cname
Merge branch 'master' of https://github.com/Flipez/flipez.github.io

Conflicts:
	CNAME