add erlang path
Merge branch 'master' of github.com:lidashuang/new_dotfiles

Conflicts:
	zshrc