work in progress
Merge branch 'master' of https://github.com/allenxyz/ditto

Conflicts:
	src/eecs285/proj4/ImageProcessorGUI.java