jsp
Merge branch 'master' of
https://github.com/krestine/randomSelectProject.git

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

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

Conflicts:
	RandomSelectProject/src/main/java/com/project/controller/MemberController.java
	RandomSelectProject/src/main/java/com/project/dao/MemberMapper.xml
	RandomSelectProject/src/main/webapp/WEB-INF/views/main.jsp
	RandomSelectProject/src/main/webapp/WEB-INF/views/member/findId.jsp
	RandomSelectProject/src/main/webapp/WEB-INF/views/member/login.jsp
	RandomSelectProject/src/main/webapp/WEB-INF/views/member/memIdAjax.jsp
	RandomSelectProject/src/main/webapp/WEB-INF/views/member/register.jsp