added colors, but lighting still doesn't work right for the second player
merged changes