unnecessary changes
Merge branch 'master' of https://github.com/Honoo42/refactoru-midterm-triviagame

Conflicts:
	main.js