Set terminal to 256 colors
Merge branch 'master' of github.com:binaryphile/dotfiles

Conflicts:
	.zshrc