added game over messages
merge conflicts