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

Conflicts:
	templates/index.html