서연이꺼 에러 수정한다고 건드린거 충돌 난듯?
Merge branch 'master' of github.com:krestine/randomSelectProject

Conflicts:
	RandomSelectProject/src/main/java/com/project/controller/EvaluateController.java
Merge branch 'master' of github.com:krestine/randomSelectProject
Merge branch 'master' of github.com:krestine/randomSelectProject
관리자 : 회원 관련 SQL 수정 및 memberDTO 수정