Merged Jonathan's changes that git decided to remove.

Conflicts:
	src/RepColors.java