updated zshrc
Merge branch 'master' of github.com:sideb0ard/rcfilez

Conflicts:
	zshrc