bug fixed; applied wrong version of patch first time, all is well now
Merge branch 'pre-bug'

Conflicts:
	dwm
	dwm.c
	dwm.o