change cname
Merge branch 'master' of github.com:marzlia/marzlia.github.io
Merge branch 'master' of github.com:marzlia/marzlia.github.io

Conflicts:
	CNAME