fixed screens gameOver and gameCompleted
fixed conflicts

Conflicts:
	dat255_group3/src/com/dat255_group3/screen/GameOverScreen.java