correction CNAME
Merge branch 'gh-pages' of github.com:rmittl/joomlo

Conflicts:
	CNAME