config 추가
Merge branch 'master' of https://github.com/jaeronge/deploy_manager

Conflicts:
	project/Build.scala