commit so I can pull
aaa
Added database registration for questions

Question.registerQuestion(bunch of parameters)
om/sarahhtn/CS108_final_project

Conflicts:
	.metadata/.log

.metadata/.plugins/org.eclipse.core.resources/.projects/QuizWebsite/.ind
exes/e4/e4/history.index

.metadata/.plugins/org.eclipse.core.resources/.projects/QuizWebsite/.mar
kers

.metadata/.plugins/org.eclipse.core.resources/.projects/QuizWebsite/1.tr
ee

.metadata/.plugins/org.eclipse.core.resources/.projects/QuizWebsite/org.
eclipse.jdt.core/state.dat

.metadata/.plugins/org.eclipse.core.resources/.projects/QuizWebsite/org.
eclipse.wst.jsdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.root/7.tree

.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.cor
e.resources

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jst.js
p.core.prefs

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.js
dt.web.core.prefs

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.ss
e.core.prefs
	.metadata/.plugins/org.eclipse.debug.core/.launches/_Login.html.launch
	.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	.metadata/.plugins/org.eclipse.epp.usagedata.recording/upload7.csv
	.metadata/.plugins/org.eclipse.epp.usagedata.recording/upload8.csv
	.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.server.core/tmp0/wtpwebapps/QuizWebsi
te/CreateFITB.html

.metadata/.plugins/org.eclipse.wst.server.core/tmp0/wtpwebapps/QuizWebsi
te/CreatePR.html

.metadata/.plugins/org.eclipse.wst.server.core/tmp0/wtpwebapps/QuizWebsi
te/CreateQR.html

.metadata/.plugins/org.eclipse.wst.server.core/tmp0/wtpwebapps/QuizWebsi
te/WEB-INF/classes/quizsite/FriendServlet.class

.metadata/.plugins/org.eclipse.wst.server.core/tmp0/wtpwebapps/QuizWebsi
te/WEB-INF/classes/quizsite/LoginServlet.class

.metadata/.plugins/org.eclipse.wst.server.core/tmp0/wtpwebapps/QuizWebsi
te/WEB-INF/classes/quizsite/MailServlet.class

.metadata/.plugins/org.eclipse.wst.server.core/tmp0/wtpwebapps/QuizWebsi
te/WEB-INF/classes/quizsite/MultiChoice.class

.metadata/.plugins/org.eclipse.wst.server.core/tmp0/wtpwebapps/QuizWebsi
te/WEB-INF/classes/quizsite/MultiChoiceTest.class

.metadata/.plugins/org.eclipse.wst.server.core/tmp0/wtpwebapps/QuizWebsi
te/WEB-INF/classes/quizsite/Question.class

.metadata/.plugins/org.eclipse.wst.server.core/tmp0/wtpwebapps/QuizWebsi
te/WEB-INF/classes/quizsite/Quiz.class

.metadata/.plugins/org.eclipse.wst.server.core/tmp0/wtpwebapps/QuizWebsi
te/WEB-INF/classes/quizsite/QuizListener.class

.metadata/.plugins/org.eclipse.wst.server.core/tmp0/wtpwebapps/QuizWebsi
te/WEB-INF/classes/quizsite/QuizServlet.class

.metadata/.plugins/org.eclipse.wst.server.core/tmp0/wtpwebapps/QuizWebsi
te/WEB-INF/classes/quizsite/RegisterServlet.class

.metadata/.plugins/org.eclipse.wst.server.core/tmp0/wtpwebapps/QuizWebsi
te/WEB-INF/classes/quizsite/User.class

.metadata/.plugins/org.eclipse.wst.server.core/tmp0/wtpwebapps/QuizWebsi
te/test.jsp
	.metadata/.plugins/org.eclipse.wst.validation/dep.index
	QuizWebsite/.classpath
	QuizWebsite/build/classes/quizsite/QServlet.class
having troubles committing again -_-