Update
Merge branch 'master' of github.com:wichtounet/dotfiles

Conflicts:
	.config/ranger/bookmarks
	.config/ranger/history
	.zshrc
Rename