was about to do custom filters
Merge branch 'master' of https://github.com/allenxyz/ditto

Conflicts:
	src/eecs285/proj4/ColorScheme.java