edit, add, delete, and smile/frown for trivia questions
Merge branch 'master' of github.com:nningego/TriviaTime