Some changes in my life.
Merge branch 'master' of https://github.com/mavz42/dotfiles

Conflicts:
	.Xdefaults
	.zshrc