no more cname
Merge branch 'master' of https://github.com/tmartin357/tmartin357.github.com

Conflicts:
	CNAME