modified:   .i3status.conf
	modified:   .zprofile
	modified:   .zshrc
Merge branch 'master' of http://github.com/manuelbonk/dotfiles

Conflicts:
	.i3status.conf
	.zprofile

	new file:   .Xdefaults
	modified:   .i3/config
	modified:   .i3status.conf
	modified:   .vimrc
	modified:   .zprofile
	modified:   .zsh_aliases
	modified:   .zshrc
	modified:   locale.conf
	modified:   sshd_config