modified:   .zsh/lib/aliases.zsh
	modified:   .zsh/lib/history.zsh
	modified:   .zsh/history
	modified:   .zsh/history
	modified:   .zsh/history
	modified:   .zsh/history
	modified:   .zsh/lib/aliases.zsh
	deleted:    .zsh/history
Merge branch 'master' of https://github.com/manuelbonk/dotfiles