added config.h back
simpler color handling
Merge remote-tracking branch 'origin/master' into devel

Conflicts:
	bar.c
	config.h