add stuff
Merge branch 'master' of github.com:mrtazz/zshfiles

Conflicts:
	zshrc