5월 22일
Merge branch 'master' of https://github.com/jaeronge/deploy_manager

Conflicts:
	app/views/write1.scala.html