sd
Merge branch 'master' of https://github.com/danielr1996/.dotfiles

Conflicts:
	old/.zshrc