true	welcome.properties	-/Modified	Commit	src\main\resources\welcome.properties
true	welcome_french.properties	Renamed/Modified	Commit	src\main\resources\welcome_french.properties
true	welcome_zh_CN.properties	Deleted/-	Remove	src\main\resources\welcome_zh_CN.properties
true	login.jsp	-/Modified	Commit	src\main\webapp\WEB-INF\views\login.jsp
Merge origin/master
true	ImportData.java	-/Modified	Commit	src\main\java\cs544\letmegiveexam\controller\ImportData.java
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	file.xls	-/Modified	Commit	src\main\resources\file.xls
true	listQuestion.jsp	-/Modified	Commit	src\main\webapp\WEB-INF\views\listQuestion.jsp
Merge origin/master