koko
okok
ddadfasdf
okok
sdfaf
Merge branch 'master' of github.com:krestine/randomSelectProject

Conflicts:
	RandomSelectProject/src/main/java/com/project/controller/CommunityController.java
	RandomSelectProject/src/main/webapp/WEB-INF/views/community/mateList.jsp
ddd
ddd
c
ddddd
백업복원
dd
dafas
dfasdf
Merge branch 'master' of github.com:krestine/randomSelectProject

Conflicts:
	RandomSelectProject/src/main/java/com/project/dao/MemberMapper.xml
ff
Merge branch 'master' of github.com:krestine/randomSelectProject

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

Conflicts:
	RandomSelectProject/src/main/java/com/project/controller/SettingController.java