modified:   .zprofile
Merge branch 'master' of https://github.com/manuelbonk/dotfiles

Conflicts:
	.zprofile

	modified:   .i3status.conf
	modified:   .zprofile
	modified:   .zshrc