added questions to trivia
resolved merge conflict