수정중입니다
Merge branch 'cjh'

Conflicts:
	src/main/webapp/WEB-INF/views/partial/footer.jsp
Merge branch 'master' of https://github.com/KiD-repo/pipe

Conflicts:
	src/main/webapp/WEB-INF/views/partial/footer.jsp