Created a color table unifier
Working out weird merge conflict stuff.  I hate Git.
Resolving weird conflicts.  Git is annoying.

Conflicts:
	src/bitbit/BitBit.java
	src/bitbit/Bitmap.java