ee
Merge branch 'master' of github.com:krestine/randomSelectProject
20140624
Merge branch 'master' of github.com:krestine/randomSelectProject
Merge branch 'master' of github.com:krestine/randomSelectProject
fafa
Merge branch 'master' of github.com:krestine/randomSelectProject

Conflicts:
	RandomSelectProject/src/main/java/com/project/controller/EvaluateController.java
asasfasdf
ddd
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/java/com/project/dao/MemberMapper.xml
	RandomSelectProject/src/main/java/com/project/dao/MenuMapper.xml
ddd
Merge branch 'master' of github.com:krestine/randomSelectProject

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

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