Einige kleinigkeiten
Merge remote-tracking branch 'origin'

Conflicts:
	zsh/histfile
Merge branch 'master' of https://github.com/soapsurfer/dotfiles