removed fonts.conf
Merge remote-tracking branch 'upstream/master'
other colors... again
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.Xresources
	.pentadactylrc
	.xmonad/xmonad.hs
	bin/dm