replaced i3status with conky
Merge branch 'master' of github.com:BenDoan/dotfiles

Conflicts:
	.i3/config