난 탈출!
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/footer.jsp
	RandomSelectProject/src/main/webapp/WEB-INF/views/header.jsp
	RandomSelectProject/src/main/webapp/WEB-INF/views/layout.jsp
	RandomSelectProject/src/main/webapp/WEB-INF/views/main.jsp
	RandomSelectProject/src/main/webapp/WEB-INF/views/menu2.jsp
ajax지옥에 오신걸 환영합니다.
Merge branch 'master' of
https://github.com/krestine/randomSelectProject.git

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