Moved the CNAME file from root into public, so it's deployed to the right place
Merge branch 'source' of github.com:davidyell/davidyell.github.com into source

Conflicts: