abcabc
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/community/mateDetail.jsp
	RandomSelectProject/src/main/webapp/WEB-INF/views/community/restntDetail.jsp
	RandomSelectProject/src/main/webapp/WEB-INF/views/community/restntList.jsp
	RandomSelectProject/src/main/webapp/WEB-INF/views/main.jsp