Added zsh-syntax-highlighting
Merge branch 'origin/master'
Merge branch 'origin/zaw'

Conflicts:
	.gitmodules
Merge branch 'origin/zsh-syntax-highlighting'

Conflicts:
	.gitmodules
	zshrc