colors
Merge branch 'master' of https://github.com/shtr0m/dwm6

Conflicts:
	.gitignore
	config.h