change wm colors
Merge branch 'master' into desktop

Conflicts:
	xmonad/xmonad.start