Wavefront and Brushfire work now.
shade(img) shades the image according to the wave/brush/pix values.
Merge branch 'master' of github.com:niive12/CupCollector

Conflicts:
	code/cupcollector/main.cpp
	code/cupcollector/tekmap/tekmap.hpp