addded stuff

GameOver screen
lose paint
deleted test colors
Merge remote-tracking branch 'origin/master'

Conflicts:
	cs/tetris/Board.java