Added makefiles and fixed compilation
Merged conflicts

Conflicts:
	lib/dlm.h