Digitiser recent
dmon conflict resolved

Conflicts:
	dmon/dmon
	dmon/dmon.c
	dmon/dmon.o