showInfo, studio list의 view 수정 main.js 오류 해결
paging 작업
no message
Merge branch 'studio'
Merge branch 'master' of https://github.com/KiD-repo/pipe
Merge branch 'master' into view-2nd

* master:
  showInfo, studio list의 view 수정 main.js 오류 해결
  git ignore 커밋
  이그노
Merge branch 'master' into cjh
ignore update
권범수 - test.....gitignore는 도대체 왜 자꾸....
css 2차 수정
Merge branch 'view-2nd'

* view-2nd:
  css 2차 수정
  paging 작업
show info view ok!
Merge branch 'showInfo'
뷰 , 레지스트 jsp 수정
Merge branch 'cjh'
ignore
Merge branch 'master' of https://github.com/KiD-repo/pipe
Merge branch '1229Jeon'

Conflicts:
	src/main/webapp/WEB-INF/views/board/memberReq/view.jsp
	src/main/webapp/WEB-INF/views/partial/footer.jsp
	src/main/webapp/resources/script/main.js
Merge branch 'master' into 1229Jeon

Conflicts:
	target/classes/org/kids/controller/board/ReplyController.class
	target/classes/org/kids/service/board/FileService.class