fading set to 20
Merge remote-tracking branch 'upstream/master'
Update .Xresources
Update .Xresources
Merge remote-tracking branch 'upstream/master'
new blue color
new red
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.xmobar/conkyrc-xmobar