Modified
Merge remote-tracking branch 'origin/master'

Conflicts:
	.tmux.conf
	.zshrc
Merge branch 'master' of https://github.com/jtwp470/dotfiles

Conflicts:
	.tmux.conf
	.zshrc
Merge branch 'master' of https://github.com/jtwp470/dotfiles

Conflicts:
	.zshrc