original files
cname change
Merge branch 'gh-pages'

Conflicts:
	CNAME
cname fix & small changes
Merge branch 'master' of github.com:graemearthur/graemearthur.github.com

Conflicts:
	CNAME