Color Palette pop up with 256 COLORZZ
Color Block Pop Up Working (kinda)
Merge branch 'master' of https://github.com/allenxyz/ditto

Conflicts:
	src/eecs285/proj4/ImageProcessor.java
	src/eecs285/proj4/ImageProcessorGUI.java