dc
Merge branch 'master' of github.com:krestine/randomSelectProject
ddd
Merge branch 'master' of github.com:krestine/randomSelectProject

Conflicts:
	RandomSelectProject/src/main/java/com/project/dao/EvaluateMapper.java
	RandomSelectProject/src/main/java/com/project/service/EvaluateServiceImpl.java
dd
Merge branch 'master' of github.com:krestine/randomSelectProject

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

Conflicts:
	RandomSelectProject/src/main/webapp/WEB-INF/views/community/restntDetail.jsp
	RandomSelectProject/src/main/webapp/WEB-INF/views/community/restntList.jsp
	RandomSelectProject/src/main/webapp/WEB-INF/views/main.jsp
kk
kjkj
Merge branch 'master' of github.com:krestine/randomSelectProject
Merge branch 'master' of github.com:krestine/randomSelectProject

Conflicts:
	RandomSelectProject/src/main/webapp/WEB-INF/views/community/restntList.jsp
	RandomSelectProject/src/main/webapp/WEB-INF/views/main.jsp
ghkgk
Merge branch 'master' of github.com:krestine/randomSelectProject

Conflicts:
	RandomSelectProject/src/main/webapp/WEB-INF/views/community/restntList.jsp
	RandomSelectProject/src/main/webapp/WEB-INF/views/main.jsp
trtt
fgdgdg
dfs
fsdfd
dd
dfdf