Branch Test
Merge branch 'master' into lhj

* master:
  주석지움

Conflicts:
	src/main/java/org/kids/controller/board/ReplyController.java
Merge commit 'eefcdf0b64e2f0ddb78d71ca4d8022d2666bc4ab' into lhj

* commit 'eefcdf0b64e2f0ddb78d71ca4d8022d2666bc4ab':
  git-hub test 만듬

Conflicts:
	src/main/java/org/kids/controller/board/FileController.java
	src/main/java/org/kids/controller/board/ReplyController.java
branch commit test
Merge branch 'master' into lhj

* master:

Conflicts:
	src/main/java/org/kids/controller/board/FileController.java
Merge branch 'master' of https://github.com/KiD-repo/pipe

# By ehdwls525
# Via ehdwls525
* 'master' of https://github.com/KiD-repo/pipe:
  memberReq 테스트 하나만듬
충돌 해결