Setting up dotfiles on new computer
Merge branch 'master' of github.com:janecakemaster/dotfiles

Conflicts:
	.zshrc