FREE COLOR for you guys! mwahahah
Merge remote-tracking branch 'origin/master'

Conflicts:
	main.c