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

Conflicts:
	templates/submit.html
testing things for the combo
Merge branch 'master' of https://github.com/ensign-redshirt/FunnyTriviaRepository