new spacing
new xmobar-git / icons / xmonad / xinitrc / conky
create direct into backup
Merge remote-tracking branch 'upstream/master'

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