Color sampling
Merge branch 'master' of github.com:scanlime/ecstatic-epiphany

Conflicts:
	src/precursor.h