true	QuestionSetController.java	-/Modified	Commit	src\main\java\cs544\letmegiveexam\controller\QuestionSetController.java
true	UserExamController.java	-/Modified	Commit	src\main\java\cs544\letmegiveexam\controller\UserExamController.java
true	UserExamDAO.java	-/Modified	Commit	src\main\java\cs544\letmegiveexam\dao\UserExamDAO.java
true	Question.java	-/Modified	Commit	src\main\java\cs544\letmegiveexam\model\Question.java
true	QuestionSet.java	-/Modified	Commit	src\main\java\cs544\letmegiveexam\model\QuestionSet.java
true	UserExam.java	-/Modified	Commit	src\main\java\cs544\letmegiveexam\model\UserExam.java
true	UserExamService.java	-/Modified	Commit	src\main\java\cs544\letmegiveexam\service\UserExamService.java
true	sideBar.jsp	-/Modified	Commit	src\main\webapp\WEB-INF\template\sideBar.jsp
true	examHistory.jsp	-/Modified	Commit	src\main\webapp\WEB-INF\views\examHistory.jsp
true	listQuestion.jsp	-/Modified	Commit	src\main\webapp\WEB-INF\views\listQuestion.jsp
true	QuestionSetController.java	-/Modified	Commit	src\main\java\cs544\letmegiveexam\controller\QuestionSetController.java
true	UserExamController.java	-/Modified	Commit	src\main\java\cs544\letmegiveexam\controller\UserExamController.java
true	UserExamDAO.java	-/Modified	Commit	src\main\java\cs544\letmegiveexam\dao\UserExamDAO.java
true	Question.java	-/Modified	Commit	src\main\java\cs544\letmegiveexam\model\Question.java
true	QuestionSet.java	-/Modified	Commit	src\main\java\cs544\letmegiveexam\model\QuestionSet.java
true	UserExam.java	-/Modified	Commit	src\main\java\cs544\letmegiveexam\model\UserExam.java
true	UserExamService.java	-/Modified	Commit	src\main\java\cs544\letmegiveexam\service\UserExamService.java
true	sideBar.jsp	-/Modified	Commit	src\main\webapp\WEB-INF\template\sideBar.jsp
true	examHistory.jsp	-/Modified	Commit	src\main\webapp\WEB-INF\views\examHistory.jsp
true	listQuestion.jsp	-/Modified	Commit	src\main\webapp\WEB-INF\views\listQuestion.jsp
resolve conflict
Merge origin/master

Conflicts:
	src/main/java/cs544/letmegiveexam/controller/UserExamController.java
	src/main/webapp/WEB-INF/views/listQuestion.jsp