breaking colors
Merge branch '16color' of github.com:JustinHop/Profile into 16color

Conflicts:
	vimrc