256color
Merge branch 'master' of https://github.com/GHKEN/dotfiles

Conflicts:
	.zshrc