changed comment
Merge branch 'master' of https://github.com/ensign-redshirt/FunnyTriviaRepository
Merge branch 'master' of https://github.com/ensign-redshirt/FunnyTriviaRepository
not my server
Merge branch 'master' of https://github.com/ensign-redshirt/FunnyTriviaRepository

Conflicts:
	server.py