added Question.registerQuestion
added Question.registerQuestion
Merge branch 'master' of https://github.com/sarahhtn/CS108_final_project
workkkkk

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/QuizWebsite/.indexes/e4/e4/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/QuizWebsite/.markers
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.epp.usagedata.recording/usagedata.csv
	.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml
	.metadata/.plugins/org.eclipse.wst.validation/dep.index