genre
Merge branch 'master' of https://github.com/ensign-redshirt/FunnyTriviaRepository

genre
Merge branch 'master' of https://github.com/ensign-redshirt/FunnyTriviaRepository

Conflicts:
	utils.pyc
Merge branch 'master' of https://github.com/ensign-redshirt/FunnyTriviaRepository

Conflicts:
	utils.pyc