adjusted colors / fontconfig
color adjustment
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.Xresources
	.pentadactylrc
	.xmobar/conkyrc-xmobar
	.xmonad/xmonad.hs