missing a color
Merge remote-tracking branch 'origin/NickGame' into NickGame

Conflicts:
	GraphicsAssignment4/src/the_game.java
Scoring works