update
Merge branch 'master' of https://github.com/da1/dotfiles

Conflicts:
	zshrc