아작아작아작!!!
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/menu2.jsp
Merge branch 'master' of
https://github.com/krestine/randomSelectProject.git

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