Conflicts:
	.gitignore
	Knot.files
	Makefile
	src/dnslib/zone-dump.c
	src/dnslib/zone-load.c
	src/dnslib/zone.c
	src/dnslib/zone.h
	src/other/debug.h
	src/other/log.c
	src/server/name-server.c
	src/server/server.c

Added missing files to makefile, disabled hash table (bug).
Added dependency on libcrypto (OpenSSL).
Various other fixes.