Coloring with base16-shell
Merge branch 'master' of github:mpoussevin/dotfiles

Conflicts:
	README.md