merge
refactored Code, gameOverActivity not working !