Merge branch 'singletagset' into demo

Conflicts:
	dwm.c