update trivia branch

just cause I don't know how this git merge/pull business works and this should be safe...