update trivia
edit to .gitignore file
merge