1
1
Merge remote-tracking branch 'origin/master'

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

	target/m2e-wtp/web-resources/META-INF/maven/org.h4c/board/pom.properties
Merge branch 'master' of https://github.com/hyunbeom/board

Conflicts:

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