Add note
Merge branch 'test/branches' of https://github.com/cjlien42/zsh-git-prompt into test/branches

Conflicts:
	README.rst