update
Merge branch 'master' of github.com:nouh/dotfile

Conflicts:
	zshrc