.
Merge branch 'master' of github.com:ralfwierzbicki/dwm

Conflicts:
	dwm/config.h
	dwm/dwm.c