pull이 안되서 하는 commit
Merge branch 'master' of https://github.com/hjra/may5.git

Conflicts:
	CShop/src/main/webapp/WEB-INF/views/mng/loginMng/loginOk.jsp
Merge branch 'master' of https://github.com/hjra/may5.git
게시판 구현 중단 ㅠㅠ