Added some stuff to zshrc
Merge branch 'master' of github.com:jangerritharms/home

Conflicts:
	.zshrc