커밋

커
Merge branch 'master' of https://github.com/hyunbeom/board

Conflicts:
	src/main/webapp/WEB-INF/views/board/detail.jsp
	src/main/webapp/WEB-INF/web.xml

target/m2e-wtp/web-resources/META-INF/maven/org.h4c/board/pom.properties
커밋ㄹㄷㄹ

ㅎㅎ
Merge branch 'master' of https://github.com/hyunbeom/board

Conflicts:
	src/main/java/org/h4c/board/BoardController.java
	src/main/java/org/h4c/mapper/BoardMapper.xml
	src/main/java/org/h4c/vo/BoardVO.java
	src/main/webapp/WEB-INF/views/board/detail.jsp
	src/main/webapp/WEB-INF/views/board/list.jsp
	target/classes/org/h4c/board/BoardController.class
	target/classes/org/h4c/vo/BoardVO.class

target/m2e-wtp/web-resources/META-INF/maven/org.h4c/board/pom.properties