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

Conflicts:
	RandomSelectProject/src/main/webapp/WEB-INF/views/main.jsp
헤헤헿