new conkyrc-xmobar
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.xmobar/conkyrc-xmobar