added monocleborders
Merge branch 'master' into monocleborders
Merge branch 'monocleborders' into master

Conflicts:
	monsterwm.c

added user-defined variable to en-/disable monocle borders