finally updated
Merge branch 'master' of https://github.com/kdzh/dotfiles

Conflicts:
	.Xauthority
	.Xresources
	.i3/conkyrc
	.oh-my-zsh