cname file
Git...
Merge pull request #1 from johnotander/master

Fix merge.