Initial commit
Adding CNAME
Merge remote-tracking branch 'origin/master'

Conflicts:
	feed.xml
	sitemap.xml