initial layouts per desktop
nmaster layout mode
merge

Conflicts:
	config.def.h
merge

Conflicts:
	config.def.h
	monsterwm.c
made config changes