mem수정
f
Merge branch 'master' of github.com:krestine/randomSelectProject

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

Conflicts:
	RandomSelectProject/src/main/java/com/project/controller/CommunityController.java
	RandomSelectProject/src/main/java/com/project/dao/MemberMapper.java
	RandomSelectProject/src/main/java/com/project/dao/MemberMapper.xml
	RandomSelectProject/src/main/java/com/project/service/MemberService.java
	RandomSelectProject/src/main/java/com/project/service/MemberServiceImpl.java
Member쪽 수정
Merge branch 'master' of github.com:krestine/randomSelectProject