reduce_palette
Merge branch 'master' of https://github.com/Lobelie/ACT-TP3

Conflicts:
	main.c
	palette.h