.
.
Merge branch 'master' of https://github.com/jagleeso/dotfiles

Conflicts:
	.zshrc_uoftpc
	bin/zsh/uoftpc/goldd
	bin/zsh/uoftpc/kmsg