modified:   .vimrc
	modified:   .zsh_aliases
	modified:   locale.conf
Merge branch 'master' of https://github.com/manuelbonk/dotfiles