cname name fix
Merge branch 'master' of git@github.com:bnfinet/docker-dns.git

Conflicts:
	server.js