Tiny change
Merge branch 'master' of https://github.com/Mzartek/AlgoComb

Conflicts:
	src/color.c
	src/color.h
	src/main.c
Minor change