no message
Merge branch 'master' of https://github.com/mojjong/8bittravel

Conflicts:
	target/classes/org/yo/guidebbs/service/GuideBbsService.class
	target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
no message
Merge branch 'master' of https://github.com/mojjong/8bittravel

Conflicts:
	src/main/webapp/WEB-INF/views/bbs/guidebbs/guideboard.jsp
	target/classes/org/yo/guidebbs/service/GuideBbsService.class
	target/classes/org/yo/web/GuideBbsController.class