끄아아악
Merge branch 'master' of github.com:krestine/randomSelectProject
ajax가 날 아작내고 있다
Merge branch 'master' of github.com:krestine/randomSelectProject

Conflicts:
	RandomSelectProject/pom.xml
	RandomSelectProject/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml