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

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

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