update
Merge branch 'master' of github.com:dh83/script

Conflicts:
	zshrc