dnsserver
Merge branch 'master' of github.com:pietdaniel/CDN
git ingore
Merge branch 'master' of github.com:pietdaniel/CDN