use submodule!
Merge branch 'master' of github.com:dock0/dns

Conflicts:
	Dockerfile