new file:   .Xdefaults
	modified:   .i3/config
	modified:   .i3status.conf
	modified:   .zsh_aliases
Merge branch 'master' of http://github.com/manuelbonk/dotfiles