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

Conflicts:
	server.py
fixed some final things