added trivia to singleplayer menu
merge conflicts