merged to master
Create CNAME
Merge pull request #1 from Maskedman/master

merge dev to prod