dont pish
Merge branch 'master' of https://github.com/ensign-redshirt/FunnyTriviaRepository
adds Genre type for submission and will work once table has changed
Merge branch 'master' of https://github.com/ensign-redshirt/FunnyTriviaRepository

Conflicts:
	utils.pyc
fun stuff