was not a good idea to set locale LC_ALL
Merge branch 'master' of github.com:marchesM/dotfiles

Conflicts:
	zshrc