added new win and lose screen
fixed merge