평가 수
Merge branch 'master' of
https://github.com/krestine/randomSelectProject.git

Conflicts:
	RandomSelectProject/src/main/webapp/WEB-INF/views/randomSelect/main.jsp
Merge branch 'master' of
https://github.com/krestine/randomSelectProject.git

Conflicts:
	RandomSelectProject/src/main/java/com/project/controller/EvaluateController.java
	RandomSelectProject/src/main/java/com/project/service/EvaluateService.java
	RandomSelectProject/src/main/java/com/project/service/EvaluateServiceImpl.java
	RandomSelectProject/src/main/webapp/WEB-INF/views/randomSelect/main.jsp
Merge branch 'master' of
https://github.com/krestine/randomSelectProject.git

Conflicts:
	RandomSelectProject/src/main/java/com/project/controller/EvaluateController.java
우어어어
Merge branch 'master' of
https://github.com/krestine/randomSelectProject.git

Conflicts:
	RandomSelectProject/src/main/webapp/WEB-INF/views/randomSelect/main.jsp