My stuff on server
Merge branch 'master' of https://github.com/ensign-redshirt/FunnyTriviaRepository
Merge branch 'master' of https://github.com/ensign-redshirt/FunnyTriviaRepository
not again
Merge branch 'master' of https://github.com/ensign-redshirt/FunnyTriviaRepository
Merge branch 'master' of https://github.com/ensign-redshirt/FunnyTriviaRepository
Things work. LEAVE THEM ALONE!
Merge branch 'master' of https://github.com/ensign-redshirt/FunnyTriviaRepository

Conflicts:
	templates/triviadisplay.html