게시판
파일명변경
정연우 페이징
정연우 페이징
쉘스크립트 출력
충돌해결
Conflicts:
	.target/views/write.scala.html
	.target/views/write1.scala.html~
	app/controllers/DistributeBoard.java
	app/controllers/TroubleBoard.java
	app/models/Shareboard.java
	app/models/User.java
	app/views/edit.scala.html
	app/views/front.scala.html
	app/views/index.scala.html
	app/views/index1.scala.html
	app/views/main.scala.html
	app/views/write1.scala.html
	app/views/write1.scala.html~
	conf/routes